[Rt-commit] rt branch, 4.4/selfservice-user-info-display-options, repushed

[Maureen Mirville]

The branch 4.4/selfservice-user-info-display-options was deleted and repushed:
       was f548dd599f56f779be0dfe23df40dcff52888eae
       now 32804605ea4159c64b62456c87f64b6e22fe4df6

1: 3c5f6c304 = 1: 3c5f6c304 Remove Signature feature from SelfService Prefs
2: 95fdd8272 ! 2: 5c575617b Allow self service users varied access to their stored RT user information
    @@ -22,7 +22,7 @@
     +=item C<$SelfServiceUserPrefs>
     +
     +This option controls how the SelfService user preferences page is
    -+displayed. It accepts a string from one of the three possible modes
    ++displayed. It accepts a string from one of the four possible modes
     +below.
     +
     +=over
    @@ -495,7 +495,7 @@
     +% if ( $UserObj->Lang ) {
     +          <td class="value"><&|/l, $lang &>[_1]</&></td>
     +% } else {
    -+          <td class="value"><&|/l&>English</&></td>
    ++          <td class="value"><&|/l&>System Default</&></td>
     +% }
     +        </tr>
     +        <tr>
    @@ -619,7 +619,7 @@
     +
     +my $pref = RT->Config->Get( 'SelfServiceUserPrefs' ) || '';
     +
    -+if ( $pref eq 'edit-prefs' || $pref eq 'full-edit' || $pref eq 'edit-prefs-view-info' ) {
    ++if ( $pref eq 'edit-prefs' || $pref eq 'full-edit' ) {
     +
     +    if ( defined $NewPass1 && length $NewPass1 ) {
     +        my ($status, $msg) = $user->SafeSetPassword(
    @@ -683,7 +683,7 @@
     -    $session{'CurrentUser'}->LanguageHandle($Lang);
     -    $session{'CurrentUser'} = $session{'CurrentUser'}; # force writeback
     -}
    -+    push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $user );
    ++    push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $user ) if $pref eq 'full-edit';
     +
     +    if ( $Lang ) {
     +        $session{'CurrentUser'}->LanguageHandle($Lang);
3: 4c73bee9d ! 3: 090260f75 Update ModifySelf rights check for Preferences tab in SelfService
    @@ -22,16 +22,3 @@
          }
      
     
    -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
    -@@
    - 
    - my $pref = RT->Config->Get( 'SelfServiceUserPrefs' ) || '';
    - 
    --if ( $pref eq 'edit-prefs' || $pref eq 'full-edit' || $pref eq 'edit-prefs-view-info' ) {
    -+if ( $pref eq 'edit-prefs' || $pref eq 'full-edit' ) {
    - 
    -     if ( defined $NewPass1 && length $NewPass1 ) {
    -         my ($status, $msg) = $user->SafeSetPassword(
    -
4: e78f618fd = 4: 263a13072 Add $SelfServiceUserPrefs config tests to verify SelfService display
5: f548dd599 ! 5: 32804605e Add config to allow SelfService users to request user info updates
    @@ -133,7 +133,7 @@
      my $password = [ qw(CurrentPass NewPass1 NewPass2) ];
      
      my $pref = RT->Config->Get( 'SelfServiceUserPrefs' ) || '';
    -+my $request_portlet = RT->Config->Get( 'SelfServiceRequestUpdatePortlet' ) || undef;
    ++my $request_portlet = RT->Config->Get( 'SelfServiceRequestUpdatePortlet' );
      
      if ( $pref eq 'edit-prefs' || $pref eq 'full-edit' ) {