[Rt-commit] r10656 - in rt/branches/3.999-DANGEROUS/html/Admin: Elements Global
ruz at bestpractical.com
ruz at bestpractical.com
Fri Feb 1 13:09:42 EST 2008
Author: ruz
Date: Fri Feb 1 13:09:07 2008
New Revision: 10656
Modified:
rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditScrip
rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectTemplate
rt/branches/3.999-DANGEROUS/html/Admin/Global/Scrip.html
rt/branches/3.999-DANGEROUS/html/Admin/Global/Scrips.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrip.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrips.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Template.html
Log:
* Queue argument in html/Admin/
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditScrip
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditScrip (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditScrip Fri Feb 1 13:09:07 2008
@@ -49,7 +49,7 @@
<form method="post" action="Scrip.html">
<input type="hidden" class="hidden" name="id" value="<% $id %>" />
-<input type="hidden" class="hidden" name="queue" value="<% $Queue %>" />
+<input type="hidden" class="hidden" name="queue" value="<% $queue %>" />
<&| /Widgets/TitleBox, title => _('Scrip Fields') &>
<table>
@@ -74,7 +74,7 @@
<& /Admin/Elements/SelectTemplate,
name => "Scrip-$id-Template",
Default => $ARGS{"Scrip-$id-Template"} || $scrip->template_obj->id,
- queue => $Queue,
+ queue => $queue,
&></td></tr>
<tr><td align="right"><&|/l&>stage</&>:</td><td>
@@ -154,13 +154,13 @@
<%ARGS>
$id => undef
$title => undef
-$Queue => 0
+$queue => 0
</%ARGS>
<%METHOD Process>
<%ARGS>
$id => undef
-$Queue => undef
+$queue => undef
</%ARGS>
<%INIT>
return ($id) unless $id;
@@ -168,7 +168,7 @@
my $scrip = RT::Model::Scrip->new();
if ( $id eq 'new' ) {
return $scrip->create(
- queue => $Queue,
+ queue => $queue,
scrip_action => $ARGS{"Scrip-new-scrip_action"},
scrip_condition => $ARGS{"Scrip-new-scrip_condition"},
template => $ARGS{"Scrip-new-Template"},
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectTemplate
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectTemplate (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectTemplate Fri Feb 1 13:09:07 2008
@@ -67,8 +67,8 @@
my $PrimaryTemplates = RT::Model::TemplateCollection->new();
-if ($Queue != 0) {
-$PrimaryTemplates->limit_to_queue($Queue);
+if ($queue != 0) {
+$PrimaryTemplates->limit_to_queue($queue);
$PrimaryTemplates->order_by(column => 'name');
}
@@ -79,7 +79,7 @@
</%INIT>
<%ARGS>
-$Queue => undef
+$queue => undef
$Default => 'none'
$DefaultQueue => undef
$name => 'template'
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Global/Scrip.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Global/Scrip.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Global/Scrip.html Fri Feb 1 13:09:07 2008
@@ -63,7 +63,7 @@
},
B => {
title => _('New scrip'),
- path => "Admin/Global/Scrip.html?create=1&Queue=0",
+ path => "Admin/Global/Scrip.html?create=1&queue=0",
separator => 1,
},
};
@@ -73,15 +73,15 @@
my ($title, $current_subtab);
if ( $id ) {
- $current_subtab = "Admin/Global/Scrip.html?id=$id&Queue=0";
+ $current_subtab = "Admin/Global/Scrip.html?id=$id&queue=0";
$title = _("Modify a scrip which applies to all queues");
$subtabs->{"C"} = {
title => _('Scrip #%1', $id),
- path => "Admin/Global/Scrip.html?id=$id&Queue=0",
+ path => "Admin/Global/Scrip.html?id=$id&queue=0",
};
}
else {
- $current_subtab = "Admin/Global/Scrip.html?create=1&Queue=0";
+ $current_subtab = "Admin/Global/Scrip.html?create=1&queue=0";
$title = _("Add a scrip which will apply to all queues");
}
</%init>
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Global/Scrips.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Global/Scrips.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Global/Scrips.html Fri Feb 1 13:09:07 2008
@@ -60,7 +60,7 @@
path => "Admin/Global/Scrips.html",
},
B => { title => _('New scrip'),
- path => "Admin/Global/Scrip.html?create=1&Queue=0",
+ path => "Admin/Global/Scrip.html?create=1&queue=0",
separator => 1,
}
};
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrip.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrip.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrip.html Fri Feb 1 13:09:07 2008
@@ -58,7 +58,7 @@
<%init>
my $queue_obj = RT::Model::Queue->new();
-$queue_obj->load( $Queue );
+$queue_obj->load( $queue );
unless( $queue_obj->id ) {
abort(_("Queue %1 not found", $id));
}
@@ -71,7 +71,7 @@
},
B => {
title => _('New scrip'),
- path => "Admin/Queues/Scrip.html?create=1&Queue=".$queue_obj->id,
+ path => "Admin/Queues/Scrip.html?create=1&queue=".$queue_obj->id,
separator => 1,
},
};
@@ -80,14 +80,14 @@
($id, my @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS );
if ( $id ) {
- $current_subtab = "Admin/Queues/Scrip.html?id=$id&Queue=". $queue_obj->id;
+ $current_subtab = "Admin/Queues/Scrip.html?id=$id&queue=". $queue_obj->id;
$title = _("Modify a scrip for queue %1", $queue_obj->name);
$subtabs->{"C"} = {
title => _("Scrip #%1",$id),
- path => "Admin/Queues/Scrip.html?id=$id&Queue=".$queue_obj->id
+ path => "Admin/Queues/Scrip.html?id=$id&queue=".$queue_obj->id
};
} else {
- $current_subtab = "Admin/Queues/Scrip.html?create=1&Queue=".$queue_obj->id;
+ $current_subtab = "Admin/Queues/Scrip.html?create=1&queue=".$queue_obj->id;
$title = _("Create a scrip for queue %1", $queue_obj->name);
}
@@ -96,5 +96,5 @@
<%ARGS>
$id => undef
-$Queue => undef
+$queue => undef
</%ARGS>
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrips.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrips.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrips.html Fri Feb 1 13:09:07 2008
@@ -76,7 +76,7 @@
path => "Admin/Queues/Scrips.html?id=".$id,
},
B => { title => _('New scrip'),
- path => "Admin/Queues/Scrip.html?create=1&Queue=".$id,
+ path => "Admin/Queues/Scrip.html?create=1&queue=".$id,
separator => 1,
}
};
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Template.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Template.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Template.html Fri Feb 1 13:09:07 2008
@@ -46,9 +46,9 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/QueueTabs, id => $Queue,
+<& /Admin/Elements/QueueTabs, id => $queue,
queue_obj => $queue_obj,
- current_tab => 'Admin/Queues/Templates.html?id='.$Queue,
+ current_tab => 'Admin/Queues/Templates.html?id='.$queue,
current_subtab => $current_subtab,
subtabs => $subtabs,
Title => $title &>
@@ -62,7 +62,7 @@
% }
%# hang onto the queue id
-<input type="hidden" class="hidden" name="queue" value="<%$Queue%>" />
+<input type="hidden" class="hidden" name="queue" value="<%$queue%>" />
<& /Admin/Elements/ModifyTemplate, name => $template_obj->name, description =>
$template_obj->description, Content => $template_obj->content &>
<& /Elements/Submit, Label => _('Create'), Reset => 1 &>
@@ -76,22 +76,22 @@
my $subtabs = {
A => { title => _('Select template'),
- path => "Admin/Queues/Templates.html?id=$Queue"
+ path => "Admin/Queues/Templates.html?id=$queue"
},
B => { title => _('New template'),
- path => "Admin/Queues/Template.html?Create=1&Queue=$Queue",
+ path => "Admin/Queues/Template.html?Create=1&queue=$queue",
separator => 1,
}
};
if ($Create) {
$title = _("Create a template");
- $current_subtab = "Admin/Queues/Template.html?Create=1&Queue=".$Queue;
+ $current_subtab = "Admin/Queues/Template.html?Create=1&queue=".$queue;
}
else {
if ($Template eq 'new') {
- my ($val, $msg) = $template_obj->create(queue => $Queue, name => $name);
+ my ($val, $msg) = $template_obj->create(queue => $queue, name => $name);
abort(_("Could not create template: %1", $msg)) unless ($val);
push @results, $msg;
}
@@ -104,26 +104,26 @@
}
my $queue_obj;
if ($template_obj->id()) {
- $Queue = $template_obj->queue;
+ $queue = $template_obj->queue;
$queue_obj = $template_obj->queue_obj;
my @attribs = qw( description Content queue name);
my @aresults = update_record_object( AttributesRef => \@attribs,
object => $template_obj,
ARGSRef => \%ARGS);
- $current_subtab = "Admin/Queues/Template.html?Queue=$Queue&Template=".$template_obj->id();
+ $current_subtab = "Admin/Queues/Template.html?queue=$queue&Template=".$template_obj->id();
$subtabs->{"C"} = { title => _('Template #%1', $template_obj->id()),
- path => "Admin/Queues/Template.html?Queue=$Queue&Template=".$template_obj->id(),
+ path => "Admin/Queues/Template.html?queue=$queue&Template=".$template_obj->id(),
};
push @results, @aresults;
} else {
$queue_obj = RT::Model::Queue->new();
- $queue_obj->load($Queue);
+ $queue_obj->load($queue);
}
</%INIT>
<%ARGS>
-$Queue => ''
+$queue => ''
$Template => ''
$Create => undef
$name => undef
More information about the Rt-commit
mailing list