summaryrefslogtreecommitdiff
path: root/rt/html/Admin
diff options
context:
space:
mode:
Diffstat (limited to 'rt/html/Admin')
-rw-r--r--rt/html/Admin/Elements/EditCustomField2
-rw-r--r--rt/html/Admin/Elements/EditScrip3
-rw-r--r--rt/html/Admin/Elements/EditTemplates2
-rw-r--r--rt/html/Admin/Elements/ModifyQueue2
-rw-r--r--rt/html/Admin/Elements/ModifyUser2
-rw-r--r--rt/html/Admin/Elements/SelectNewGroupMembers10
-rw-r--r--rt/html/Admin/Elements/UserTabs71
-rw-r--r--rt/html/Admin/Global/GroupRights.html2
-rw-r--r--rt/html/Admin/Global/Template.html2
-rw-r--r--rt/html/Admin/Global/UserRights.html2
-rw-r--r--rt/html/Admin/Groups/GroupRights.html2
-rw-r--r--rt/html/Admin/Groups/Members.html2
-rw-r--r--rt/html/Admin/Groups/Modify.html2
-rw-r--r--rt/html/Admin/Groups/UserRights.html2
-rw-r--r--rt/html/Admin/Groups/index.html12
-rw-r--r--rt/html/Admin/Queues/GroupRights.html2
-rw-r--r--rt/html/Admin/Queues/Modify.html2
-rw-r--r--rt/html/Admin/Queues/Scrip.html2
-rw-r--r--rt/html/Admin/Queues/Template.html7
-rw-r--r--rt/html/Admin/Queues/UserRights.html2
-rw-r--r--rt/html/Admin/Users/Modify.html6
21 files changed, 81 insertions, 58 deletions
diff --git a/rt/html/Admin/Elements/EditCustomField b/rt/html/Admin/Elements/EditCustomField
index 7baed168b..de3094bb0 100644
--- a/rt/html/Admin/Elements/EditCustomField
+++ b/rt/html/Admin/Elements/EditCustomField
@@ -59,7 +59,7 @@
<& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &>
</font>
% }
-<&/Elements/Submit&>
+<&/Elements/Submit, Label => loc('Create') &>
</FORM>
diff --git a/rt/html/Admin/Elements/EditScrip b/rt/html/Admin/Elements/EditScrip
index 1f186c233..9b1ad4a47 100644
--- a/rt/html/Admin/Elements/EditScrip
+++ b/rt/html/Admin/Elements/EditScrip
@@ -92,7 +92,7 @@
</TD>
</TR>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
</FORM>
<%init>
my (@actions);
@@ -114,6 +114,7 @@ if ( $id eq 'new' ) {
);
if ( defined $retval ) {
push @actions, $msg;
+ $id = $scrip->id;
}
else {
Abort( $msg);
diff --git a/rt/html/Admin/Elements/EditTemplates b/rt/html/Admin/Elements/EditTemplates
index 12677ca78..2d13457c2 100644
--- a/rt/html/Admin/Elements/EditTemplates
+++ b/rt/html/Admin/Elements/EditTemplates
@@ -54,7 +54,7 @@
</TABLE>
% }
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Delete Template') &>
</FORM>
<%INIT>
diff --git a/rt/html/Admin/Elements/ModifyQueue b/rt/html/Admin/Elements/ModifyQueue
index e5761df35..36f9ce17f 100644
--- a/rt/html/Admin/Elements/ModifyQueue
+++ b/rt/html/Admin/Elements/ModifyQueue
@@ -63,7 +63,7 @@
</TD>
</TR>
</TABLE>
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Save Changes') &>
</form>
<& /Elements/TitleBoxEnd &>
diff --git a/rt/html/Admin/Elements/ModifyUser b/rt/html/Admin/Elements/ModifyUser
index 876e8a71b..2faefefaa 100644
--- a/rt/html/Admin/Elements/ModifyUser
+++ b/rt/html/Admin/Elements/ModifyUser
@@ -84,7 +84,7 @@
<BR>
<&|/l&>Country</&>: <input name="Country" value="<%$UserObj->Country%>">
<BR>
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Save Changes') &>
</form>
<& /Elements/TitleBoxEnd &>
diff --git a/rt/html/Admin/Elements/SelectNewGroupMembers b/rt/html/Admin/Elements/SelectNewGroupMembers
index e5c28e909..256d15b6c 100644
--- a/rt/html/Admin/Elements/SelectNewGroupMembers
+++ b/rt/html/Admin/Elements/SelectNewGroupMembers
@@ -42,8 +42,14 @@
<%INIT>
my $users = new RT::Users($session{'CurrentUser'});
-$users->Limit(FIELD => 'id', VALUE => $RT::SystemUser->id, OPERATOR => '!=' );
-$users->Limit(FIELD => 'id', VALUE => $RT::Nobody->id, OPERATOR => '!=' );
+$users->Limit(FIELD => 'id',
+ VALUE => $RT::SystemUser->id,
+ OPERATOR => '!=',
+ ENTRYAGGREGATOR =>'AND');
+$users->Limit(FIELD => 'id',
+ VALUE => $RT::Nobody->id,
+ OPERATOR => '!=',
+ ENTRYAGGREGATOR =>'AND');
$users->LimitToPrivileged();
my $groups = new RT::Groups($session{'CurrentUser'});
diff --git a/rt/html/Admin/Elements/UserTabs b/rt/html/Admin/Elements/UserTabs
index 764fdfcb5..8d8f769a4 100644
--- a/rt/html/Admin/Elements/UserTabs
+++ b/rt/html/Admin/Elements/UserTabs
@@ -21,54 +21,57 @@
%#
%#
%# END LICENSE BLOCK
-<& /Admin/Elements/Tabs,
+<& /Admin/Elements/Tabs,
subtabs => $tabs,
- current_tab => 'Admin/Users/',
- current_subtab => $current_subtab,
+ current_tab => 'Admin/Users/',
+ current_subtab => $current_tab,
Title => $Title &>
<%INIT>
my $tabs;
-my $subtabs;
if ($id) {
-$tabs->{'this'} = { title => eval { $UserObj->Name },
-
- path => "Admin/Users/Modify.html?id=".$id,
-subtabs => {
- Queues => { title => loc('Basics'),
- path => "Admin/Users/Modify.html?id=".$id
- },
-# Scrips => { title => loc('Rights'),
-# path => "Admin/Users/Rights.html?id=".$id
-# }
-
- }
+ $tabs->{'this'} = {
+ title => eval { $UserObj->Name },
+ path => "Admin/Users/Modify.html?id=".$id,
+ current_subtab => $current_tab,
+ subtabs => {
+ A => { title => loc('Basics'),
+ path => "Admin/Users/Modify.html?id=".$id
+ },
+ }
+ }
}
+
+if ( $session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers') ) {
+ $tabs->{"A"} = {
+ title => loc('Select user'),
+ path => "Admin/Users/",
+ };
+ $tabs->{"B"} = {
+ title => loc('New user'),
+ path => "Admin/Users/Modify.html?Create=1",
+ separator => 1,
+ };
}
-if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers')) {
- $tabs->{"A"} = { title => loc('Select user'),
- path => "Admin/Users/",
- };
- $tabs->{"B"} = { title => loc('New user'),
- path => "Admin/Users/Modify.html?Create=1",
- separator => 1,
- };
+
+# Now let callbacks add their extra tabs
+$m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+
+foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {
+ if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
+ $tabs->{'this'}->{"current_subtab"} = $current_tab;
+ $tabs->{'this'}->{'subtabs'}->{$tab}->{"current_subtab"} = $current_subtab;
+ $tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"} = $subtabs;
+ }
}
- # Now let callbacks add their extra tabs
- $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
-
-foreach my $tab ( sort keys %{$tabs} ) {
- if ( $tabs->{$tab}->{'path'} eq $current_subtab ) {
- $tabs->{$tab}->{"current_subtab"} = $current_subtab;
- }
-}
+$current_tab = "Admin/Users/Modify.html?id=".$id if $id;
+
</%INIT>
-
-
<%ARGS>
$UserObj => undef
$id => undef
$current_tab => undef
+$subtabs => undef
$current_subtab => undef
$Title => undef
</%ARGS>
diff --git a/rt/html/Admin/Global/GroupRights.html b/rt/html/Admin/Global/GroupRights.html
index 150e83f43..7bb8c4d57 100644
--- a/rt/html/Admin/Global/GroupRights.html
+++ b/rt/html/Admin/Global/GroupRights.html
@@ -81,7 +81,7 @@
</TABLE>
<& /Elements/TitleBoxEnd &>
- <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+ <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
</FORM>
diff --git a/rt/html/Admin/Global/Template.html b/rt/html/Admin/Global/Template.html
index 71f77e9dd..742c48901 100644
--- a/rt/html/Admin/Global/Template.html
+++ b/rt/html/Admin/Global/Template.html
@@ -42,7 +42,7 @@
<& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description => $TemplateObj->Description, Content => $TemplateObj->Content &>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Save Changes'), Reset => 1 &>
</FORM>
diff --git a/rt/html/Admin/Global/UserRights.html b/rt/html/Admin/Global/UserRights.html
index aee82d1f4..abd748bff 100644
--- a/rt/html/Admin/Global/UserRights.html
+++ b/rt/html/Admin/Global/UserRights.html
@@ -50,7 +50,7 @@
</TABLE>
<& /Elements/TitleBoxEnd &>
- <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+ <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
</FORM>
diff --git a/rt/html/Admin/Groups/GroupRights.html b/rt/html/Admin/Groups/GroupRights.html
index 6220259d3..c1223078e 100644
--- a/rt/html/Admin/Groups/GroupRights.html
+++ b/rt/html/Admin/Groups/GroupRights.html
@@ -69,7 +69,7 @@
</TABLE>
<& /Elements/TitleBoxEnd &>
- <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+ <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
</FORM>
diff --git a/rt/html/Admin/Groups/Members.html b/rt/html/Admin/Groups/Members.html
index 6e669666f..e0c8ddb73 100644
--- a/rt/html/Admin/Groups/Members.html
+++ b/rt/html/Admin/Groups/Members.html
@@ -77,7 +77,7 @@
</TR>
</TABLE>
<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Modify Members'), Reset => 1 &>
</form>
diff --git a/rt/html/Admin/Groups/Modify.html b/rt/html/Admin/Groups/Modify.html
index c5e91588e..499781937 100644
--- a/rt/html/Admin/Groups/Modify.html
+++ b/rt/html/Admin/Groups/Modify.html
@@ -52,7 +52,7 @@
<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this group)</&><BR>
</TR>
</TABLE>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
</form>
<%INIT>
diff --git a/rt/html/Admin/Groups/UserRights.html b/rt/html/Admin/Groups/UserRights.html
index 0a87ef860..8b4efd21a 100644
--- a/rt/html/Admin/Groups/UserRights.html
+++ b/rt/html/Admin/Groups/UserRights.html
@@ -51,7 +51,7 @@
</TABLE>
<& /Elements/TitleBoxEnd &>
- <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+ <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
</FORM>
diff --git a/rt/html/Admin/Groups/index.html b/rt/html/Admin/Groups/index.html
index 57c86c90e..f3ae2305a 100644
--- a/rt/html/Admin/Groups/index.html
+++ b/rt/html/Admin/Groups/index.html
@@ -32,12 +32,24 @@
<LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name || loc('(empty)')%></a><BR>
%}
</UL>
+<br><br>
+<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Groups/index.html">
+<input type="checkbox" name="FindDisabledGroups"> <&|/l&>Include disabled groups in listing.</&>
+<BR>
+<div align=right><input type=submit value="<&|/l&>Go!</&>"></div>
+</FORM>
<%INIT>
my $Groups = RT::Groups->new($session{'CurrentUser'});
+
+if ($FindDisabledGroups) {
+ $Groups->{'find_disabled_rows'} = 1;
+}
+
$Groups->LimitToUserDefinedGroups();
my $title = loc('Select a group');
</%INIT>
<%ARGS>
+$FindDisabledGroups => 0
</%ARGS>
diff --git a/rt/html/Admin/Queues/GroupRights.html b/rt/html/Admin/Queues/GroupRights.html
index a1ac709e1..df12f449f 100644
--- a/rt/html/Admin/Queues/GroupRights.html
+++ b/rt/html/Admin/Queues/GroupRights.html
@@ -82,7 +82,7 @@
% }
</TABLE>
- <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+ <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
</FORM>
diff --git a/rt/html/Admin/Queues/Modify.html b/rt/html/Admin/Queues/Modify.html
index 46608eba6..8fa278bf6 100644
--- a/rt/html/Admin/Queues/Modify.html
+++ b/rt/html/Admin/Queues/Modify.html
@@ -86,7 +86,7 @@
</TR>
</TABLE>
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Save Changes') &>
</form>
diff --git a/rt/html/Admin/Queues/Scrip.html b/rt/html/Admin/Queues/Scrip.html
index edbfcd66b..dad330f84 100644
--- a/rt/html/Admin/Queues/Scrip.html
+++ b/rt/html/Admin/Queues/Scrip.html
@@ -51,7 +51,7 @@ unless($QueueObj->id) {
if ($id) {
$current_subtab = "Admin/Queues/Scrip.html?id=".$id."&Queue=".$QueueObj->id;
$title = loc("Modify a scrip for queue [_1]", $QueueObj->Name);
- $subtabs->{"C"} = { title => loc("Scrip #[_1]",$QueueObj->id),
+ $subtabs->{"C"} = { title => loc("Scrip #[_1]",$id),
path => "Admin/Queues/Scrip.html?id=$id&Queue=".$QueueObj->id };
} else {
$current_subtab = "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id;
diff --git a/rt/html/Admin/Queues/Template.html b/rt/html/Admin/Queues/Template.html
index 994de6108..0e72e5d05 100644
--- a/rt/html/Admin/Queues/Template.html
+++ b/rt/html/Admin/Queues/Template.html
@@ -23,7 +23,7 @@
%# END LICENSE BLOCK
<& /Admin/Elements/Header, Title => $title &>
<& /Admin/Elements/QueueTabs, id => $Queue,
- QueueObj => $TemplateObj->QueueObj,
+ QueueObj => $QueueObj,
current_tab => 'Admin/Queues/Templates.html?id='.$Queue,
current_subtab => $current_subtab,
subtabs => $subtabs,
@@ -41,12 +41,15 @@
<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
<& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description =>
$TemplateObj->Description, Content => $TemplateObj->Content &>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
</FORM>
<%INIT>
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($Queue);
+
my $TemplateObj = new RT::Template($session{'CurrentUser'});
my ($title, @results, $current_subtab);
diff --git a/rt/html/Admin/Queues/UserRights.html b/rt/html/Admin/Queues/UserRights.html
index aeb55c70b..123a46f8b 100644
--- a/rt/html/Admin/Queues/UserRights.html
+++ b/rt/html/Admin/Queues/UserRights.html
@@ -50,7 +50,7 @@
% }
</TABLE>
- <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+ <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
</FORM>
diff --git a/rt/html/Admin/Users/Modify.html b/rt/html/Admin/Users/Modify.html
index b424ae961..5fb941114 100644
--- a/rt/html/Admin/Users/Modify.html
+++ b/rt/html/Admin/Users/Modify.html
@@ -25,7 +25,7 @@
<& /Admin/Elements/UserTabs,
id => $id,
UserObj => $UserObj,
- current_subtab => $current_tab,
+ current_tab => $current_tab,
Title => $title &>
<& /Elements/ListActions, actions => \@results &>
@@ -197,7 +197,7 @@
</TR>
</TABLE>
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Save Changes') &>
</form>
<%INIT>
@@ -243,8 +243,6 @@ else {
$Create = 1;
}
-
-
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-08 19:24:05 +0000