import rt 3.0.12

7 files changed, 51 insertions, 41 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>