[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.10-66-g41e0b38

[Jesse Vincent]

The branch, 4.2-trunk has been updated
       via  41e0b3813095e18e2da0cc3a005fe2e3cc7a4abd (commit)
       via  abc37eee2e58a6701df4934e2bc0bb06f6818b60 (commit)
       via  19583b792dbac267090fe192e8ee32e94f57902a (commit)
       via  97e46857139e8b90fbd9246c6c2dea866840014e (commit)
       via  be3bd40ab7fb87a543b66494a849bc2f15eeec3b (commit)
       via  3a49bdf3c8d9412a9174d483d1f8d9a5d214f2ef (commit)
       via  471e089dcbd472d7312762596f5d4a32ccfb6c27 (commit)
       via  33206029c0d449ec499ef7e0b40adbc86f6afbb1 (commit)
       via  9c96fea7d212163b2456e86df753abc10ff69279 (commit)
       via  28542d144d29adc806c6e0fc6962c1301e55d37e (commit)
       via  75e6fc2914c7b576fc763a4a47d8807bf169dc60 (commit)
      from  6f41ca2bfca5a23245e244d82ed5af23816f0b35 (commit)

Summary of changes:
 share/html/Admin/Users/Modify.html | 231 ++++++++++++-------------------------
 1 file changed, 73 insertions(+), 158 deletions(-)

- Log -----------------------------------------------------------------
commit 41e0b3813095e18e2da0cc3a005fe2e3cc7a4abd
Merge: 6f41ca2 abc37ee
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Mar 3 22:06:36 2015 -0800

    Merge branch '4.2/admin-user-modify' into 4.2-trunk
    
    * 4.2/admin-user-modify:
      Drop an unused variable
      Use // for defaulting, not ||
      Drop giant %ARGS list, and access $ARGS{} for our defaults
      Unify two parallel if/else blocks
      Use @fields list in creation as well as update
      Standardize Disabled/Privileged bits
      Drop an unused variable
      Move PrivilegedChecked and EnabledChecked closer to where they are used
      Whitespace cleanups
      Use variable values from %ARGS, to allow BeforeCreate to adjust them
    
    Conflicts:
    	share/html/Admin/Users/Modify.html

diff --cc share/html/Admin/Users/Modify.html
index d892422,b48f7ec..426d262
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@@ -206,13 -207,13 +207,13 @@@
  </td></tr>
  <tr>
  <td colspan="2">
 -<&| /Widgets/TitleBox, title => loc('Comments about this user') &>
 +<&| /Widgets/TitleBox, title => loc('Comments about this user'), class => 'user-info-comments' &>
- <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') &>
 +<&| /Widgets/TitleBox, title => loc('Signature'), class => 'user-info-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>
  </&>
  % }
  

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