[Rt-commit] rt branch, 4.2/admin-user-modify, created. rt-4.2.3-96-gabc37ee

Alex Vandiver alexmv at bestpractical.com
Thu Apr 24 16:42:57 EDT 2014


The branch, 4.2/admin-user-modify has been created
        at  abc37eee2e58a6701df4934e2bc0bb06f6818b60 (commit)

- Log -----------------------------------------------------------------
commit 75e6fc2914c7b576fc763a4a47d8807bf169dc60
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 15:31:21 2014 -0400

    Use variable values from %ARGS, to allow BeforeCreate to adjust them
    
    Fixes I#27655.

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index ba9379c..64a24cb 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -318,15 +318,15 @@ if ($UserObj->Id && $id ne 'new') {
 
 
     # {{{ Deal with special fields: Privileged, Enabled
-    if  ( $SetPrivileged and $Privileged != ($UserObj->Privileged || 0) ) {
-         my ($code, $msg) = $UserObj->SetPrivileged($Privileged);
+    if  ( $ARGS{SetPrivileged} and $ARGS{Privileged} != ($UserObj->Privileged || 0) ) {
+         my ($code, $msg) = $UserObj->SetPrivileged($ARGS{Privileged});
          push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
     }
 
     #we're asking about enabled on the web page but really care about disabled.
-    $Disabled = $Enabled ? 0 : 1;
+    $Disabled = $ARGS{Enabled} ? 0 : 1;
 
-    if  ( ($SetEnabled) and ( $Disabled != $UserObj->Disabled) ) { 
+    if  ( ($ARGS{SetEnabled}) and ( $Disabled != $UserObj->Disabled) ) {
         my  ($code, $msg) = $UserObj->SetDisabled($Disabled);
         push @results, $msg;
     }
@@ -356,7 +356,7 @@ unless ( $UserObj->id && $UserObj->Disabled ) {
     $EnabledChecked = 'checked="checked"';
 }
 
-if ((!$Create && $UserObj->Privileged()) or (!$UserObj->Id and $Privileged)) {  
+if ((!$Create && $UserObj->Privileged()) or (!$UserObj->Id and $ARGS{Privileged})) {
     $PrivilegedChecked = 'checked="checked"';
 }
 

commit 28542d144d29adc806c6e0fc6962c1301e55d37e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 15:37:52 2014 -0400

    Whitespace cleanups

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index 64a24cb..5e6cc95 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -74,27 +74,27 @@
 <input name="EmailAddress" value="<%$UserObj->EmailAddress||$EmailAddress||''%>" />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Real Name</&>: 
+<&|/l&>Real Name</&>:
 </td><td>
 <input name="RealName" value="<%$UserObj->RealName||$RealName||''%>" />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Nickname</&>: 
+<&|/l&>Nickname</&>:
 </td><td>
 <input name="NickName" value="<%$UserObj->NickName||$NickName||''%>" />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Unix login</&>: 
+<&|/l&>Unix login</&>:
 </td><td>
 <input name="Gecos" value="<%$UserObj->Gecos||$Gecos||''%>" />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Language</&>: 
+<&|/l&>Language</&>:
 </td><td>
 <& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang||$Lang &>
 </td></tr>
 <tr><td align="right">
-<&|/l&>Extra info</&>: 
+<&|/l&>Extra info</&>:
 </td><td>
 <textarea name="FreeformContactInfo" cols="20" rows="5"><%$UserObj->FreeformContactInfo||$FreeformContactInfo||''%></textarea>
 </td></tr>
@@ -128,39 +128,39 @@
 <&| /Widgets/TitleBox, title => loc('Location'), class => 'user-info-location' &>
 <table>
 <tr><td align="right">
-<&|/l&>Organization</&>: 
+<&|/l&>Organization</&>:
 </td><td>
 <input name="Organization" value="<%$UserObj->Organization||$Organization||''%>" />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Address1</&>: 
+<&|/l&>Address1</&>:
 </td><td>
 <input name="Address1" value="<%$UserObj->Address1||$Address1||''%>" />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Address2</&>: 
+<&|/l&>Address2</&>:
 </td><td>
 <input name="Address2" value="<%$UserObj->Address2||$Address2||''%>" />
 </td></tr>
 <tr><td align="right">
-<&|/l&>City</&>: 
+<&|/l&>City</&>:
 </td><td>
 <input name="City" value="<%$UserObj->City||$City||''%>" size="14" />
 
 </td></tr>
 <tr><td align="right">
-<&|/l&>State</&>: 
+<&|/l&>State</&>:
 </td><td>
 <input name="State" value="<%$UserObj->State||$State||''%>" size="3" />
 
 </td></tr>
 <tr><td align="right">
-<&|/l&>Zip</&>: 
+<&|/l&>Zip</&>:
 </td><td>
 <input name="Zip" value="<%$UserObj->Zip||$Zip||''%>" size="9" />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Country</&>: 
+<&|/l&>Country</&>:
 </td><td>
 <input name="Country" value="<%$UserObj->Country||$Country||''%>" />
 </td></tr>
@@ -173,22 +173,22 @@
 <&| /Widgets/TitleBox, title => loc('Phone numbers'), class => 'user-info-phones' &>
 <table>
 <tr><td align="right">
-<&|/l&>Residence</&>: 
+<&|/l&>Residence</&>:
 </td><td>
 <input name="HomePhone" value="<%$UserObj->HomePhone||$HomePhone||''%>" size="13" /><br />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Work</&>: 
+<&|/l&>Work</&>:
 </td><td>
 <input name="WorkPhone" value="<%$UserObj->WorkPhone||$WorkPhone||''%>" size="13" /><br />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Mobile</&>: 
+<&|/l&>Mobile</&>:
 </td><td>
 <input name="MobilePhone" value="<%$UserObj->MobilePhone||$MobilePhone||''%>" size="13" /><br />
 </td></tr>
 <tr><td align="right">
-<&|/l&>Pager</&>: 
+<&|/l&>Pager</&>:
 </td><td>
 <input name="PagerPhone" value="<%$UserObj->PagerPhone||$PagerPhone||''%>" size="13" /><br />
 </td>
@@ -236,7 +236,7 @@ my ($val, $msg);
 
 if ($Create) {
     $title = loc("Create a new user");
-} 
+}
 else {
 
     if ( defined $id && $id eq 'new') {
@@ -269,18 +269,18 @@ else {
             State                 => $ARGS{'State'},
             Zip                   => $ARGS{'Zip'},
             Country               => $ARGS{'Country'},
-            Privileged           => $ARGS{'Privileged'},
-            Disabled            => ($ARGS{'Enabled'} ? 0 : 1)
+            Privileged            => $ARGS{'Privileged'},
+            Disabled              => ($ARGS{'Enabled'} ? 0 : 1)
         );
 
         if ($val) {
-                push @results, $msg;
-        push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
+            push @results, $msg;
+            push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
         } else {
-                push @results, loc('User could not be created: [_1]', $msg);
+            push @results, loc('User could not be created: [_1]', $msg);
         }
     } else {
-            $UserObj->Load($id) || $UserObj->Load($Name) 
+        $UserObj->Load($id) || $UserObj->Load($Name)
             || Abort("Couldn't load user '" . ( $Name || '') . "'");
         $val = $UserObj->Id();
     }
@@ -296,18 +296,16 @@ else {
     }
 }
 
-
 $m->callback( %ARGS, CallbackName => 'BeforeUpdate', User => $UserObj, ARGSRef => \%ARGS, Results => \@results );
 
-
-# If we have a user to modify, lets try. 
+# If we have a user to modify, lets try.
 if ($UserObj->Id && $id ne 'new') {
 
-    my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo 
-                    Organization RealName NickName Lang EmailEncoding WebEncoding 
-                    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId 
+    my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo
+                    Organization RealName NickName Lang EmailEncoding WebEncoding
+                    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId
                     AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
-                    Address2 City State Zip Country 
+                    Address2 City State Zip Country
                    );
 
     my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
@@ -316,7 +314,6 @@ if ($UserObj->Id && $id ne 'new') {
     push (@results, at fieldresults);
     push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
 
-
     # {{{ Deal with special fields: Privileged, Enabled
     if  ( $ARGS{SetPrivileged} and $ARGS{Privileged} != ($UserObj->Privileged || 0) ) {
          my ($code, $msg) = $UserObj->SetPrivileged($ARGS{Privileged});
@@ -330,8 +327,6 @@ if ($UserObj->Id && $id ne 'new') {
         my  ($code, $msg) = $UserObj->SetDisabled($Disabled);
         push @results, $msg;
     }
-
-
 }
 
 

commit 9c96fea7d212163b2456e86df753abc10ff69279
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 16:12:34 2014 -0400

    Move PrivilegedChecked and EnabledChecked closer to where they are used

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index 5e6cc95..3b214b2 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -105,12 +105,13 @@
 <br />
 <&| /Widgets/TitleBox, title => loc('Access control'), class => 'user-info-access-control' &>
 <input type="hidden" class="hidden" name="SetEnabled" value="1" />
-<input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked%> />
+<input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <% ($UserObj->Id && $UserObj->Disabled) ? '' : 'checked="checked"' |n%> />
 <label for="Enabled"><&|/l&>Let this user access RT</&></label><br />
 
 
+% my $PrivilegedChecked = ((!$Create && $UserObj->Privileged()) or (!$UserObj->Id and $ARGS{Privileged})) ? 'checked="checked"' : '';
 <input type="hidden" class="hidden" name="SetPrivileged" value="1" />
-<input type="checkbox" class="checkbox" id="Privileged" name="Privileged" value="1" <%$PrivilegedChecked||''%> />
+<input type="checkbox" class="checkbox" id="Privileged" name="Privileged" value="1" <%$PrivilegedChecked|n%> />
 <label for="Privileged"><&|/l&>Let this user be granted rights</&> (<&|/l&>Privileged</&>)</label><br />
 
 <& /Elements/EditPassword,
@@ -230,7 +231,7 @@
 <%INIT>
 
 my $UserObj = RT::User->new($session{'CurrentUser'});
-my ($title, $PrivilegedChecked, $EnabledChecked, $Disabled, $result, @results);
+my ($title, $Disabled, $result, @results);
 
 my ($val, $msg);
 
@@ -345,16 +346,6 @@ if ( $UserObj->Id ) {
     }
 }
 
-
-# Do some setup for the ui
-unless ( $UserObj->id && $UserObj->Disabled ) {
-    $EnabledChecked = 'checked="checked"';
-}
-
-if ((!$Create && $UserObj->Privileged()) or (!$UserObj->Id and $ARGS{Privileged})) {
-    $PrivilegedChecked = 'checked="checked"';
-}
-
 # This code does automatic redirection if any updates happen.
 MaybeRedirectForResults(
     Actions   => \@results,

commit 33206029c0d449ec499ef7e0b40adbc86f6afbb1
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 16:13:47 2014 -0400

    Drop an unused variable

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index 3b214b2..cc6df9b 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -231,7 +231,7 @@
 <%INIT>
 
 my $UserObj = RT::User->new($session{'CurrentUser'});
-my ($title, $Disabled, $result, @results);
+my ($title, $Disabled, @results);
 
 my ($val, $msg);
 

commit 471e089dcbd472d7312762596f5d4a32ccfb6c27
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 16:16:15 2014 -0400

    Standardize Disabled/Privileged bits

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index cc6df9b..bce35a4 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -231,10 +231,16 @@
 <%INIT>
 
 my $UserObj = RT::User->new($session{'CurrentUser'});
-my ($title, $Disabled, @results);
+my ($title, @results);
 
 my ($val, $msg);
 
+$ARGS{Privileged} = $ARGS{Privileged} ? 1 : 0;
+delete $ARGS{Privileged} unless $ARGS{SetPrivileged};
+
+$ARGS{Disabled} = $ARGS{Enabled} ? 0 : 1;
+delete $ARGS{Disabled} unless $ARGS{SetEnabled};
+
 if ($Create) {
     $title = loc("Create a new user");
 }
@@ -271,7 +277,7 @@ else {
             Zip                   => $ARGS{'Zip'},
             Country               => $ARGS{'Country'},
             Privileged            => $ARGS{'Privileged'},
-            Disabled              => ($ARGS{'Enabled'} ? 0 : 1)
+            Disabled              => $ARGS{'Disabled'},
         );
 
         if ($val) {
@@ -315,17 +321,13 @@ if ($UserObj->Id && $id ne 'new') {
     push (@results, at fieldresults);
     push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
 
-    # {{{ Deal with special fields: Privileged, Enabled
-    if  ( $ARGS{SetPrivileged} and $ARGS{Privileged} != ($UserObj->Privileged || 0) ) {
-         my ($code, $msg) = $UserObj->SetPrivileged($ARGS{Privileged});
-         push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
+    if ( defined $ARGS{Privileged} and $ARGS{Privileged} != ($UserObj->Privileged || 0) ) {
+        my ($code, $msg) = $UserObj->SetPrivileged($ARGS{Privileged});
+        push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
     }
 
-    #we're asking about enabled on the web page but really care about disabled.
-    $Disabled = $ARGS{Enabled} ? 0 : 1;
-
-    if  ( ($ARGS{SetEnabled}) and ( $Disabled != $UserObj->Disabled) ) {
-        my  ($code, $msg) = $UserObj->SetDisabled($Disabled);
+    if ( defined $ARGS{Disabled} and $ARGS{Disabled} != $UserObj->Disabled ) {
+        my ($code, $msg) = $UserObj->SetDisabled($ARGS{Disabled});
         push @results, $msg;
     }
 }

commit 3a49bdf3c8d9412a9174d483d1f8d9a5d214f2ef
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 16:18:37 2014 -0400

    Use @fields list in creation as well as update

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index bce35a4..f6693ec 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -241,6 +241,13 @@ delete $ARGS{Privileged} unless $ARGS{SetPrivileged};
 $ARGS{Disabled} = $ARGS{Enabled} ? 0 : 1;
 delete $ARGS{Disabled} unless $ARGS{SetEnabled};
 
+my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo
+                Organization RealName NickName Lang EmailEncoding WebEncoding
+                ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId
+                AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
+                Address2 City State Zip Country
+               );
+
 if ($Create) {
     $title = loc("Create a new user");
 }
@@ -248,36 +255,9 @@ else {
 
     if ( defined $id && $id eq 'new') {
         ( $val, $msg ) = $UserObj->Create(
-            Name                  => $Name,
-            EmailAddress          => $ARGS{'EmailAddress'},
-            Name                  => $ARGS{'Name'},
-            Comments              => $ARGS{'Comments'},
-            Signature             => $ARGS{'Signature'},
-            EmailAddress          => $ARGS{'EmailAddress'},
-            FreeformContactInfo   => $ARGS{'FreeformContactInfo'},
-            Organization          => $ARGS{'Organization'},
-            RealName              => $ARGS{'RealName'},
-            NickName              => $ARGS{'NickName'},
-            Lang                  => $ARGS{'Lang'},
-            EmailEncoding         => $ARGS{'EmailEncoding'},
-            WebEncoding           => $ARGS{'WebEncoding'},
-            ExternalContactInfoId => $ARGS{'ExternalContactInfoId'},
-            ContactInfoSystem     => $ARGS{'ContactInfoSystem'},
-            Gecos                 => $ARGS{'Gecos'},
-            ExternalAuthId        => $ARGS{'ExternalAuthId'},
-            AuthSystem            => $ARGS{'AuthSystem'},
-            HomePhone             => $ARGS{'HomePhone'},
-            WorkPhone             => $ARGS{'WorkPhone'},
-            MobilePhone           => $ARGS{'MobilePhone'},
-            PagerPhone            => $ARGS{'PagerPhone'},
-            Address1              => $ARGS{'Address1'},
-            Address2              => $ARGS{'Address2'},
-            City                  => $ARGS{'City'},
-            State                 => $ARGS{'State'},
-            Zip                   => $ARGS{'Zip'},
-            Country               => $ARGS{'Country'},
-            Privileged            => $ARGS{'Privileged'},
-            Disabled              => $ARGS{'Disabled'},
+            (map {($_ => $ARGS{$_})} @fields),
+            Privileged => $ARGS{'Privileged'},
+            Disabled   => $ARGS{'Disabled'},
         );
 
         if ($val) {
@@ -308,12 +288,6 @@ $m->callback( %ARGS, CallbackName => 'BeforeUpdate', User => $UserObj, ARGSRef =
 # If we have a user to modify, lets try.
 if ($UserObj->Id && $id ne 'new') {
 
-    my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo
-                    Organization RealName NickName Lang EmailEncoding WebEncoding
-                    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId
-                    AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
-                    Address2 City State Zip Country
-                   );
 
     my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
                                             Object => $UserObj,

commit be3bd40ab7fb87a543b66494a849bc2f15eeec3b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 16:20:02 2014 -0400

    Unify two parallel if/else blocks

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index f6693ec..06ea60b 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -250,44 +250,29 @@ my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo
 
 if ($Create) {
     $title = loc("Create a new user");
-}
-else {
-
-    if ( defined $id && $id eq 'new') {
-        ( $val, $msg ) = $UserObj->Create(
-            (map {($_ => $ARGS{$_})} @fields),
-            Privileged => $ARGS{'Privileged'},
-            Disabled   => $ARGS{'Disabled'},
-        );
-
-        if ($val) {
-            push @results, $msg;
-            push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
-        } else {
-            push @results, loc('User could not be created: [_1]', $msg);
-        }
-    } else {
-        $UserObj->Load($id) || $UserObj->Load($Name)
-            || Abort("Couldn't load user '" . ( $Name || '') . "'");
-        $val = $UserObj->Id();
-    }
+} elsif ( defined $id && $id eq 'new') {
+    ( $val, $msg ) = $UserObj->Create(
+        (map {($_ => $ARGS{$_})} @fields),
+        Privileged => $ARGS{'Privileged'},
+        Disabled   => $ARGS{'Disabled'},
+    );
 
     if ($val) {
+        push @results, $msg;
+        push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
         $title = loc("Modify the user [_1]", $UserObj->Name);
-    }
-
-    # If the create failed
-    else {
+    } else {
+        push @results, loc('User could not be created: [_1]', $msg);
         $title = loc("Create a new user");
         $Create = 1;
     }
-}
-
-$m->callback( %ARGS, CallbackName => 'BeforeUpdate', User => $UserObj, ARGSRef => \%ARGS, Results => \@results );
+} else {
+    $UserObj->Load($id) || $UserObj->Load($ARGS{Name})
+        || Abort("Couldn't load user '" . ( $ARGS{Name} || '') . "'");
 
-# If we have a user to modify, lets try.
-if ($UserObj->Id && $id ne 'new') {
+    $title = loc("Modify the user [_1]", $UserObj->Name);
 
+    $m->callback( %ARGS, CallbackName => 'BeforeUpdate', User => $UserObj, ARGSRef => \%ARGS, Results => \@results );
 
     my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
                                             Object => $UserObj,

commit 97e46857139e8b90fbd9246c6c2dea866840014e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 16:21:34 2014 -0400

    Drop giant %ARGS list, and access $ARGS{} for our defaults

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index 06ea60b..791cc50 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -66,37 +66,37 @@
 <tr><td align="right">
 <&|/l&>Username</&>:
 </td><td>
-<input name="Name" value="<%$UserObj->Name||$Name||''%>" /> <strong><&|/l&>(required)</&></strong>
+<input name="Name" value="<%$UserObj->Name||$ARGS{Name}||''%>" /> <strong><&|/l&>(required)</&></strong>
 </td></tr>
 <tr><td align="right">
 <&|/l&>Email</&>:
 </td><td>
-<input name="EmailAddress" value="<%$UserObj->EmailAddress||$EmailAddress||''%>" />
+<input name="EmailAddress" value="<%$UserObj->EmailAddress||$ARGS{EmailAddress}||''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Real Name</&>:
 </td><td>
-<input name="RealName" value="<%$UserObj->RealName||$RealName||''%>" />
+<input name="RealName" value="<%$UserObj->RealName||$ARGS{RealName}||''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Nickname</&>:
 </td><td>
-<input name="NickName" value="<%$UserObj->NickName||$NickName||''%>" />
+<input name="NickName" value="<%$UserObj->NickName||$ARGS{NickName}||''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Unix login</&>:
 </td><td>
-<input name="Gecos" value="<%$UserObj->Gecos||$Gecos||''%>" />
+<input name="Gecos" value="<%$UserObj->Gecos||$ARGS{Gecos}||''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Language</&>:
 </td><td>
-<& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang||$Lang &>
+<& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang||$ARGS{Lang} &>
 </td></tr>
 <tr><td align="right">
 <&|/l&>Extra info</&>:
 </td><td>
-<textarea name="FreeformContactInfo" cols="20" rows="5"><%$UserObj->FreeformContactInfo||$FreeformContactInfo||''%></textarea>
+<textarea name="FreeformContactInfo" cols="20" rows="5"><%$UserObj->FreeformContactInfo||$ARGS{FreeformContactInfo}||''%></textarea>
 </td></tr>
 <& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
 </table>
@@ -131,39 +131,39 @@
 <tr><td align="right">
 <&|/l&>Organization</&>:
 </td><td>
-<input name="Organization" value="<%$UserObj->Organization||$Organization||''%>" />
+<input name="Organization" value="<%$UserObj->Organization||$ARGS{Organization}||''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Address1</&>:
 </td><td>
-<input name="Address1" value="<%$UserObj->Address1||$Address1||''%>" />
+<input name="Address1" value="<%$UserObj->Address1||$ARGS{Address1}||''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Address2</&>:
 </td><td>
-<input name="Address2" value="<%$UserObj->Address2||$Address2||''%>" />
+<input name="Address2" value="<%$UserObj->Address2||$ARGS{Address2}||''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>City</&>:
 </td><td>
-<input name="City" value="<%$UserObj->City||$City||''%>" size="14" />
+<input name="City" value="<%$UserObj->City||$ARGS{City}||''%>" size="14" />
 
 </td></tr>
 <tr><td align="right">
 <&|/l&>State</&>:
 </td><td>
-<input name="State" value="<%$UserObj->State||$State||''%>" size="3" />
+<input name="State" value="<%$UserObj->State||$ARGS{State}||''%>" size="3" />
 
 </td></tr>
 <tr><td align="right">
 <&|/l&>Zip</&>:
 </td><td>
-<input name="Zip" value="<%$UserObj->Zip||$Zip||''%>" size="9" />
+<input name="Zip" value="<%$UserObj->Zip||$ARGS{Zip}||''%>" size="9" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Country</&>:
 </td><td>
-<input name="Country" value="<%$UserObj->Country||$Country||''%>" />
+<input name="Country" value="<%$UserObj->Country||$ARGS{Country}||''%>" />
 </td></tr>
 
 <& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Location', InTable => 1 &>
@@ -176,22 +176,22 @@
 <tr><td align="right">
 <&|/l&>Residence</&>:
 </td><td>
-<input name="HomePhone" value="<%$UserObj->HomePhone||$HomePhone||''%>" size="13" /><br />
+<input name="HomePhone" value="<%$UserObj->HomePhone||$ARGS{HomePhone}||''%>" size="13" /><br />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Work</&>:
 </td><td>
-<input name="WorkPhone" value="<%$UserObj->WorkPhone||$WorkPhone||''%>" size="13" /><br />
+<input name="WorkPhone" value="<%$UserObj->WorkPhone||$ARGS{WorkPhone}||''%>" size="13" /><br />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Mobile</&>:
 </td><td>
-<input name="MobilePhone" value="<%$UserObj->MobilePhone||$MobilePhone||''%>" size="13" /><br />
+<input name="MobilePhone" value="<%$UserObj->MobilePhone||$ARGS{MobilePhone}||''%>" size="13" /><br />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Pager</&>:
 </td><td>
-<input name="PagerPhone" value="<%$UserObj->PagerPhone||$PagerPhone||''%>" size="13" /><br />
+<input name="PagerPhone" value="<%$UserObj->PagerPhone||$ARGS{PagerPhone}||''%>" size="13" /><br />
 </td>
 </tr>
 
@@ -208,12 +208,12 @@
 <tr>
 <td colspan="2">
 <&| /Widgets/TitleBox, title => loc('Comments about this user') &>
-<textarea class="comments" name="Comments" cols="80" rows="5" wrap="virtual"><%$UserObj->Comments||$Comments||''%></textarea>
+<textarea class="comments" name="Comments" cols="80" rows="5" wrap="virtual"><%$UserObj->Comments||$ARGS{Comments}||''%></textarea>
 </&>
 %if (!$Create && $UserObj->Privileged) {
 <br />
 <&| /Widgets/TitleBox, title => loc('Signature') &>
-<textarea class="signature" cols="80" rows="5" name="Signature" wrap="hard"><%$UserObj->Signature||$Signature||''%></textarea>
+<textarea class="signature" cols="80" rows="5" name="Signature" wrap="hard"><%$UserObj->Signature||$ARGS{Signature}||''%></textarea>
 </&>
 % }
 
@@ -318,36 +318,6 @@ MaybeRedirectForResults(
 
 <%ARGS>
 $id => undef
-$Name  => undef
-$Comments  => undef
-$Signature  => undef
-$EmailAddress  => undef
-$FreeformContactInfo => undef
-$Organization  => undef
-$RealName  => undef
-$NickName  => undef
-$Privileged => 0
-$SetPrivileged => undef
-$Enabled => undef
-$SetEnabled => undef
-$Lang  => undef
-$EmailEncoding  => undef
-$WebEncoding => undef
-$ExternalContactInfoId  => undef
-$ContactInfoSystem  => undef
-$Gecos => undef
-$ExternalAuthId  => undef
-$AuthSystem  => undef
-$HomePhone => undef
-$WorkPhone  => undef
-$MobilePhone  => undef
-$PagerPhone  => undef
-$Address1 => undef
-$Address2  => undef
-$City  => undef
-$State  => undef
-$Zip  => undef
-$Country => undef
 $CurrentPass => undef
 $Pass1 => undef
 $Pass2 => undef

commit 19583b792dbac267090fe192e8ee32e94f57902a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 16:21:51 2014 -0400

    Use // for defaulting, not ||

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index 791cc50..c0513cc 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -66,37 +66,37 @@
 <tr><td align="right">
 <&|/l&>Username</&>:
 </td><td>
-<input name="Name" value="<%$UserObj->Name||$ARGS{Name}||''%>" /> <strong><&|/l&>(required)</&></strong>
+<input name="Name" value="<%$UserObj->Name//$ARGS{Name}//''%>" /> <strong><&|/l&>(required)</&></strong>
 </td></tr>
 <tr><td align="right">
 <&|/l&>Email</&>:
 </td><td>
-<input name="EmailAddress" value="<%$UserObj->EmailAddress||$ARGS{EmailAddress}||''%>" />
+<input name="EmailAddress" value="<%$UserObj->EmailAddress//$ARGS{EmailAddress}//''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Real Name</&>:
 </td><td>
-<input name="RealName" value="<%$UserObj->RealName||$ARGS{RealName}||''%>" />
+<input name="RealName" value="<%$UserObj->RealName//$ARGS{RealName}//''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Nickname</&>:
 </td><td>
-<input name="NickName" value="<%$UserObj->NickName||$ARGS{NickName}||''%>" />
+<input name="NickName" value="<%$UserObj->NickName//$ARGS{NickName}//''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Unix login</&>:
 </td><td>
-<input name="Gecos" value="<%$UserObj->Gecos||$ARGS{Gecos}||''%>" />
+<input name="Gecos" value="<%$UserObj->Gecos//$ARGS{Gecos}//''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Language</&>:
 </td><td>
-<& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang||$ARGS{Lang} &>
+<& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang//$ARGS{Lang} &>
 </td></tr>
 <tr><td align="right">
 <&|/l&>Extra info</&>:
 </td><td>
-<textarea name="FreeformContactInfo" cols="20" rows="5"><%$UserObj->FreeformContactInfo||$ARGS{FreeformContactInfo}||''%></textarea>
+<textarea name="FreeformContactInfo" cols="20" rows="5"><%$UserObj->FreeformContactInfo//$ARGS{FreeformContactInfo}//''%></textarea>
 </td></tr>
 <& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
 </table>
@@ -131,39 +131,39 @@
 <tr><td align="right">
 <&|/l&>Organization</&>:
 </td><td>
-<input name="Organization" value="<%$UserObj->Organization||$ARGS{Organization}||''%>" />
+<input name="Organization" value="<%$UserObj->Organization//$ARGS{Organization}//''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Address1</&>:
 </td><td>
-<input name="Address1" value="<%$UserObj->Address1||$ARGS{Address1}||''%>" />
+<input name="Address1" value="<%$UserObj->Address1//$ARGS{Address1}//''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Address2</&>:
 </td><td>
-<input name="Address2" value="<%$UserObj->Address2||$ARGS{Address2}||''%>" />
+<input name="Address2" value="<%$UserObj->Address2//$ARGS{Address2}//''%>" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>City</&>:
 </td><td>
-<input name="City" value="<%$UserObj->City||$ARGS{City}||''%>" size="14" />
+<input name="City" value="<%$UserObj->City//$ARGS{City}//''%>" size="14" />
 
 </td></tr>
 <tr><td align="right">
 <&|/l&>State</&>:
 </td><td>
-<input name="State" value="<%$UserObj->State||$ARGS{State}||''%>" size="3" />
+<input name="State" value="<%$UserObj->State//$ARGS{State}//''%>" size="3" />
 
 </td></tr>
 <tr><td align="right">
 <&|/l&>Zip</&>:
 </td><td>
-<input name="Zip" value="<%$UserObj->Zip||$ARGS{Zip}||''%>" size="9" />
+<input name="Zip" value="<%$UserObj->Zip//$ARGS{Zip}//''%>" size="9" />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Country</&>:
 </td><td>
-<input name="Country" value="<%$UserObj->Country||$ARGS{Country}||''%>" />
+<input name="Country" value="<%$UserObj->Country//$ARGS{Country}//''%>" />
 </td></tr>
 
 <& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Location', InTable => 1 &>
@@ -176,22 +176,22 @@
 <tr><td align="right">
 <&|/l&>Residence</&>:
 </td><td>
-<input name="HomePhone" value="<%$UserObj->HomePhone||$ARGS{HomePhone}||''%>" size="13" /><br />
+<input name="HomePhone" value="<%$UserObj->HomePhone//$ARGS{HomePhone}//''%>" size="13" /><br />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Work</&>:
 </td><td>
-<input name="WorkPhone" value="<%$UserObj->WorkPhone||$ARGS{WorkPhone}||''%>" size="13" /><br />
+<input name="WorkPhone" value="<%$UserObj->WorkPhone//$ARGS{WorkPhone}//''%>" size="13" /><br />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Mobile</&>:
 </td><td>
-<input name="MobilePhone" value="<%$UserObj->MobilePhone||$ARGS{MobilePhone}||''%>" size="13" /><br />
+<input name="MobilePhone" value="<%$UserObj->MobilePhone//$ARGS{MobilePhone}//''%>" size="13" /><br />
 </td></tr>
 <tr><td align="right">
 <&|/l&>Pager</&>:
 </td><td>
-<input name="PagerPhone" value="<%$UserObj->PagerPhone||$ARGS{PagerPhone}||''%>" size="13" /><br />
+<input name="PagerPhone" value="<%$UserObj->PagerPhone//$ARGS{PagerPhone}//''%>" size="13" /><br />
 </td>
 </tr>
 
@@ -208,12 +208,12 @@
 <tr>
 <td colspan="2">
 <&| /Widgets/TitleBox, title => loc('Comments about this user') &>
-<textarea class="comments" name="Comments" cols="80" rows="5" wrap="virtual"><%$UserObj->Comments||$ARGS{Comments}||''%></textarea>
+<textarea class="comments" name="Comments" cols="80" rows="5" wrap="virtual"><%$UserObj->Comments//$ARGS{Comments}//''%></textarea>
 </&>
 %if (!$Create && $UserObj->Privileged) {
 <br />
 <&| /Widgets/TitleBox, title => loc('Signature') &>
-<textarea class="signature" cols="80" rows="5" name="Signature" wrap="hard"><%$UserObj->Signature||$ARGS{Signature}||''%></textarea>
+<textarea class="signature" cols="80" rows="5" name="Signature" wrap="hard"><%$UserObj->Signature//$ARGS{Signature}//''%></textarea>
 </&>
 % }
 

commit abc37eee2e58a6701df4934e2bc0bb06f6818b60
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Apr 24 16:22:00 2014 -0400

    Drop an unused variable

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index c0513cc..b48f7ec 100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -291,8 +291,6 @@ if ($Create) {
     }
 }
 
-
-my %password_cond = $UserObj->CurrentUserRequireToSetPassword;
 if ( $UserObj->Id ) {
     # Deal with Password field
     my ($status, $msg) = $UserObj->SafeSetPassword(

-----------------------------------------------------------------------


More information about the rt-commit mailing list