[Rt-commit] rt branch, 4.4/selfservice-show-more-user-info, repushed

[Maureen Mirville]

The branch 4.4/selfservice-show-more-user-info was deleted and repushed:
       was 02930ea7ba277da8d0df0d8108367f40bf6381d7
       now 8d71732c8e0171ef20de05a0213d6b34716ef8c2

1: 85b47645d = 1: 85b47645d Update article postfix loops from using $_ to a named variable
2: d9b5d635d = 2: d9b5d635d Remove Signature feature from SelfService Prefs
3: 8e2e32aa4 ! 3: eb3a5e19a Allow self service users varied access to their stored RT user information
    @@ -483,11 +483,19 @@
     +        </tr>
     +        <tr>
     +          <td class="label"><&|/l&>Language</&>:</td>
    ++% if ( $UserObj->Lang ) {
     +          <td class="value"><%$UserObj->Lang%></td>
    ++% } else {
    ++          <td class="value"><&|/l&>en</&></td>
    ++% }
     +        </tr>
     +        <tr>
     +          <td class="label"><&|/l&>Timezone</&>:</td>
    ++% if ( $UserObj->Timezone ) {
     +          <td class="value"><%$UserObj->Timezone%></td>
    ++% } else {
    ++          <td class="value"><&|/l&>System Default</&></td>
    ++% }
     +        </tr>
     +      <& /Elements/ShowCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
     +      </table>
4: 974695b76 = 4: 2de48020f Update ModifySelf rights check for Preferences tab in SelfService
5: 42187c99b = 5: ebc1edab3 Add $SelfServiceUserPrefs config tests to verify SelfService display
6: ada2d5f23 ! 6: fe3e75afd Add edit-prefs-view-info config option to $SelfServiceUserPrefs
    @@ -1,6 +1,6 @@
     Author: Maureen E. Mirville <maureen at bestpractical.com>
     
    -    Add another config option to $SelfServiceUserPrefs
    +    Add edit-prefs-view-info config option to $SelfServiceUserPrefs
         
         New display option, 'edit-prefs-view-info' for $SelfServiceUserPrefs
         was added to allow selfservice users the option to both update their
    @@ -24,18 +24,39 @@
      
      When set to C<full-edit>, users will be able to fully view and update
     
    +diff --git a/share/html/Prefs/Elements/EditAboutMe b/share/html/Prefs/Elements/EditAboutMe
    +--- a/share/html/Prefs/Elements/EditAboutMe
    ++++ b/share/html/Prefs/Elements/EditAboutMe
    +@@
    + 
    + </td>
    + <td valign="top" class="boxcontainer">
    +-<&| /Widgets/TitleBox, title => loc('Access control'), id => "user-prefs-password" &>
    ++<&| /Widgets/TitleBox, title => loc( $AccessControlName ), id => "user-prefs-password" &>
    + % if ( $UserObj->__Value('Password') ne '*NO-PASSWORD*' ) {
    + <& /Elements/EditPassword,
    +     User => $UserObj,
    +@@
    + <%ARGS>
    + $UserObj
    + $PasswordName
    ++$AccessControlName => 'Access control'
    + </%ARGS>
    +
     diff --git a/share/html/SelfService/Prefs.html b/share/html/SelfService/Prefs.html
     --- a/share/html/SelfService/Prefs.html
     +++ b/share/html/SelfService/Prefs.html
     @@
    + 
      <& /Elements/ListActions, actions => \@results &>
      % if ( $pref eq 'full-edit' ) {
    - <& /Prefs/Elements/EditAboutMe, UserObj => $user, PasswordName => $password &>
    +-<& /Prefs/Elements/EditAboutMe, UserObj => $user, PasswordName => $password &>
     -% } elsif ( $pref eq 'view-info' ) {
     -<& /Prefs/Elements/ShowAboutMe, UserObj => $user &>
     -% } else {
    ++<& /Prefs/Elements/EditAboutMe, UserObj => $user, PasswordName => $password, AccessControlName => 'Change Password' &>
     +% }
    -+% if ( $pref eq 'edit-prefs' || 'edit-prefs-view-info' ) {
    ++% if ( $pref eq 'edit-prefs' || $pref eq 'edit-prefs-view-info' ) {
      <form method="post">
      
      <table width="100%" border="0">
    @@ -54,7 +75,7 @@
      my $pref = RT->Config->Get( 'SelfServiceUserPrefs' ) || '';
      
     -if ( $pref eq 'brief' || $pref eq 'full-edit' ) {
    -+if ( $pref eq 'brief' || $pref eq 'full-edit' || $pref eq 'edit-prefs-view-info' ) {
    ++if ( $pref eq 'edit-prefs' || $pref eq 'full-edit' || $pref eq 'edit-prefs-view-info' ) {
      
          if ( defined $NewPass1 && length $NewPass1 ) {
              my ($status, $msg) = $user->SafeSetPassword(
7: 02930ea7b ! 7: e91924e23 Update $SelfServiceUserPrefs config tests to verify new display option
    @@ -25,3 +25,4 @@
          } else {
            RT::Test->add_rights( { Principal => $user_a, Right => ['ModifySelf'] } );
            my $nickname = 'user_a_nickname';
    +
-:  ------- > 8: 8d71732c8 Allow Self Service users to request updates to user's RT info