[Rt-commit] r10657 - in rt/branches/3.999-DANGEROUS/html/Admin: Elements Global
ruz at bestpractical.com
ruz at bestpractical.com
Fri Feb 1 13:25:53 EST 2008
Author: ruz
Date: Fri Feb 1 13:25:52 2008
New Revision: 10657
Modified:
rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomField
rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditScrips
rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditTemplates
rt/branches/3.999-DANGEROUS/html/Admin/Elements/ListGlobalScrips
rt/branches/3.999-DANGEROUS/html/Admin/Global/Template.html
rt/branches/3.999-DANGEROUS/html/Admin/Global/Templates.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomField.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Templates.html
Log:
* more on Queue in admin UI
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomField
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomField (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomField Fri Feb 1 13:25:52 2008
@@ -50,7 +50,7 @@
<form method="post" action="CustomField.html">
<input type="hidden" class="hidden" name="CustomField" value="<%$id %>" />
-<input type="hidden" class="hidden" name="queue" value="<%$Queue%>" />
+<input type="hidden" class="hidden" name="queue" value="<%$queue%>" />
<table width="100%" border="0">
<tr><td align="right">
@@ -100,7 +100,7 @@
} else {
if ($CustomField eq 'new') {
- my ($val, $msg) = $CustomFieldObj->create(queue => $Queue,
+ my ($val, $msg) = $CustomFieldObj->create(queue => $queue,
name => $name,
type => $Type,
description => $description,
@@ -149,7 +149,7 @@
<%ARGS>
$id => undef
$title => undef
-$Queue => undef
+$queue => undef
$CustomField => undef
$Type => undef
$description => undef
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditScrips
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditScrips (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditScrips Fri Feb 1 13:25:52 2008
@@ -63,7 +63,7 @@
<input type="checkbox" class="checkbox" name="DeleteScrip-<%$scrip->id%>" value="1" />
</td>
<td>
-<a href="Scrip.html?id=<%$scrip->id%>&Queue=<%$id%>"><% $scrip->description || "<i>("._('no value').")</i>" |n %></a><br />
+<a href="Scrip.html?id=<%$scrip->id%>&queue=<%$id%>"><% $scrip->description || "<i>("._('no value').")</i>" |n %></a><br />
<small><&|/l, _($scrip->condition_obj->name), loc($scrip->action_obj->name), loc($scrip->template_obj->name) &>%1 %2 with template %3</&></small>
</td>
</tr>
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditTemplates
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditTemplates (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditTemplates Fri Feb 1 13:25:52 2008
@@ -26,8 +26,8 @@
<%INIT>
my $dir_path = $m->request_comp->dir_path;
-$format ||= qq{'<a href="__WebPath__$dir_path/Template.html?Queue=$id&Template=__id__">__id__</a>/TITLE:#'}
- .qq{,'<a href="__WebPath__$dir_path/Template.html?Queue=$id&Template=__id__">__name__</a>/TITLE:name'}
+$format ||= qq{'<a href="__WebPath__$dir_path/Template.html?queue=$id&Template=__id__">__id__</a>/TITLE:#'}
+ .qq{,'<a href="__WebPath__$dir_path/Template.html?queue=$id&Template=__id__">__name__</a>/TITLE:name'}
.qq{,'__description__'};
my $queue_obj = RT::Model::Queue->new();
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/ListGlobalScrips
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/ListGlobalScrips (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/ListGlobalScrips Fri Feb 1 13:25:52 2008
@@ -55,7 +55,7 @@
% while (my $scrip = $Scrips->next ) {
<li>
-<a href="<%RT->config->get('WebPath')%>/Admin/Global/Scrip.html?id=<%$scrip->id%>&Queue=<%0%>">
+<a href="<%RT->config->get('WebPath')%>/Admin/Global/Scrip.html?id=<%$scrip->id%>&queue=<%0%>">
% if ($scrip->description) {
<% $scrip->description %>
% } else {
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Global/Template.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Global/Template.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Global/Template.html Fri Feb 1 13:25:52 2008
@@ -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 &>
@@ -81,20 +81,20 @@
path => "Admin/Global/Templates.html"
},
B => { title => _('New template'),
- path => "Admin/Global/Template.html?Create=1&Queue=0",
+ path => "Admin/Global/Template.html?Create=1&queue=0",
separator => 1,
}
};
if ($Create) {
- $current_subtab = "Admin/Global/Template.html?Create=1&Queue=0";
+ $current_subtab = "Admin/Global/Template.html?Create=1&queue=0";
$title = _("Create a template");
}
else {
if (defined ($Template) && $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;
}
@@ -110,15 +110,15 @@
my @aresults = update_record_object( AttributesRef => \@attribs,
object => $template_obj,
ARGSRef => \%ARGS);
- $current_subtab = "Admin/Global/Template.html?Queue=0&Template=".$template_obj->id();
+ $current_subtab = "Admin/Global/Template.html?queue=0&Template=".$template_obj->id();
$subtabs->{"C"} = { title => _('Template #%1', $template_obj->id()),
- path => "Admin/Global/Template.html?Queue=0&Template=".$template_obj->id(),
+ path => "Admin/Global/Template.html?queue=0&Template=".$template_obj->id(),
};
push @results, @aresults;
}
</%INIT>
<%ARGS>
-$Queue => undef
+$queue => undef
$Template => undef
$Create => undef
$name => undef
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Global/Templates.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Global/Templates.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Global/Templates.html Fri Feb 1 13:25:52 2008
@@ -60,7 +60,7 @@
path => "Admin/Global/Templates.html"
},
B => { title => _('New template'),
- path => "Admin/Global/Template.html?Create=1&Queue=0",
+ path => "Admin/Global/Template.html?Create=1&queue=0",
separator => 1,
}
};
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomField.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomField.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomField.html Fri Feb 1 13:25:52 2008
@@ -57,30 +57,30 @@
<%INIT>
my $queue_obj = RT::Model::Queue->new();
-$queue_obj->load($Queue);
+$queue_obj->load($queue);
my ($title, $current_subtab);
unless($queue_obj->id) {
- abort(_("Queue %1 not found", $Queue));
+ abort(_("Queue %1 not found", $queue));
}
if ($CustomField) {
$title = _('Modify a CustomField for queue %1', $queue_obj->name());
}else {
- $current_subtab = "Admin/Queues/CustomField.html?create=1&Queue=".$queue_obj->id;
+ $current_subtab = "Admin/Queues/CustomField.html?create=1&queue=".$queue_obj->id;
$title = _('Create a CustomField for queue %1', $queue_obj->name());
}
my $subtabs = {
A => { title => _('New custom field'),
- path => "Admin/Queues/CustomField.html?create=1&Queue=".$queue_obj->id
+ path => "Admin/Queues/CustomField.html?create=1&queue=".$queue_obj->id
}
};
</%INIT>
<%ARGS>
$CustomField => undef
-$Queue => 0
+$queue => 0
</%ARGS>
<%ATTR>
AutoFlush => 0
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Templates.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Templates.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Templates.html Fri Feb 1 13:25:52 2008
@@ -71,7 +71,7 @@
path => "Admin/Queues/Templates.html?id=".$id,
},
B => { title => _('New template'),
- path => "Admin/Queues/Template.html?Create=1&Queue=".$id,
+ path => "Admin/Queues/Template.html?Create=1&queue=".$id,
}
};
More information about the Rt-commit
mailing list