Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x

1 files changed, 13 insertions, 14 deletions

diff --git a/rt/share/html/Admin/Groups/Modify.html b/rt/share/html/Admin/Groups/Modify.html
index 94431d09d..6c65ea058 100755
--- a/rt/share/html/Admin/Groups/Modify.html
+++ b/rt/share/html/Admin/Groups/Modify.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -72,18 +72,17 @@
 % my $CFs = $Group->CustomFields;
 % while (my $CF = $CFs->Next) {
 <tr valign="top"><td align="right">
-<% loc($CF->Name) %>:
+<% $CF->Name %>:
 </td><td>
 <& /Elements/EditCustomField, CustomField => $CF, 
-                              Object => $Group, 
-                              ($Create ? (NamePrefix => 'Object-RT::Group--CustomField-') 
-                                       : () )&>
+                              Object => $Group, &>
 </td></tr>
 % }
 <tr>
 <td colspan="2">
 <input type="hidden" class="hidden" name="SetEnabled" value="1" />
-<input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked%> /> <&|/l&>Enabled (Unchecking this box disables this group)</&><br />
+<input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked%> />
+<label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this group)</&></label><br />
 </td>
 </tr>
 % $m->callback( %ARGS, GroupObj => $Group, results => \@results );
@@ -104,7 +103,7 @@ if ($Create) {
     $title = loc("Create a new group");
 } else {
     if ($id eq 'new' ) {
-	my ($create_id, $create_msg) = $Group->CreateUserDefinedGroup(Name => $Name );
+        my ($create_id, $create_msg) = $Group->CreateUserDefinedGroup(Name => $Name );
         if ($create_id) {
             $id = $Group->Id;
             push @results, $create_msg;
@@ -112,32 +111,32 @@ if ($Create) {
             push @results, loc("Group could not be created: [_1]", $create_msg);
         }
     } else {
-	$Group->Load($id) || Abort('Could not load group');
+        $Group->Load($id) || Abort('Could not load group');
     }
 
     if ($Group->Id) {
-	$title = loc("Modify the group [_1]", $Group->Name);
+        $title = loc("Modify the group [_1]", $Group->Name);
     }
 
     # If the create failed
     else {
-	$title = loc("Create a new group");
-	$Create = 1;
+        $title = loc("Create a new group");
+        $Create = 1;
     }
 }
 
 if ($Group->Id) {
     my @fields = qw(Description Name );
     my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
-					    Object => $Group,
-					    ARGSRef => \%ARGS );
+                                            Object => $Group,
+                                            ARGSRef => \%ARGS );
     push (@results,@fieldresults);
     push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $Group );
 
     # Warn about duplicate groups
     my $dupcheck = RT::Groups->new(RT->SystemUser);
     $dupcheck->LimitToUserDefinedGroups();
-    $dupcheck->Limit( FIELD => 'Name', VALUE => $Group->Name );
+    $dupcheck->Limit( FIELD => 'Name', VALUE => $Group->Name, CASESENSITIVE => 0 );
     if ($dupcheck->Count > 1) {
         push @warnings, loc("There is more than one group with the name '[_1]'.  This may cause inconsistency in parts of the admin interface, and therefore it's recommended you rename the conflicting groups.", $Group->Name);
     }