[Rt-commit] rt branch, 4.4/search-preference-updates, created. rt-4.4.2-27-g67a6d2a

[Maureen Mirville]

The branch, 4.4/search-preference-updates has been created
        at  67a6d2a8ddf34dae05e4c598a6fd77139dcbf09b (commit)

- Log -----------------------------------------------------------------
commit 67a6d2a8ddf34dae05e4c598a6fd77139dcbf09b
Author: Maureen E. Mirville <maureen at bestpractical.com>
Date:   Thu Aug 17 10:16:17 2017 -0400

    Allow users to restore default search preferences
    
    User can now reset search preferences to default search options.
    
    Fixes I#32854

diff --git a/share/html/Prefs/SearchOptions.html b/share/html/Prefs/SearchOptions.html
index eba5a81..903fea5 100644
--- a/share/html/Prefs/SearchOptions.html
+++ b/share/html/Prefs/SearchOptions.html
@@ -58,7 +58,9 @@
             RowsPerPage => $RowsPerPage, 
             OrderBy => $OrderBy, 
             Order => $Order &>
-
+% if ($session{'CurrentUser'}->UserObj->Preferences("SearchDisplay")) {
+<& /Elements/Submit, Name => 'Reset', Label => loc('Restore Default Preferences')&>
+% }
 <& /Elements/Submit, Name => 'SavePreferences', Label => loc('Save Changes') &>
 </form>
 <%INIT>
@@ -81,6 +83,11 @@ if ($ARGS{'SavePreferences'}) {
     push @actions, $ok ? loc("Preferences saved.") : $msg;
 }
 
+# If we're restoring default preferences, delete the user's changes
+if ($ARGS{'Reset'}) {
+    my ($ok, $msg) = $session{'CurrentUser'}->UserObj->DeletePreferences("SearchDisplay");
+    push @actions, $ok ? loc("Default preferences restored.") : $msg;
+}
 
 # Read from user preferences
 my $prefs = $session{'CurrentUser'}->UserObj->Preferences("SearchDisplay") || {};
@@ -95,6 +102,7 @@ my ( $AvailableColumns, $CurrentFormat );
     '/Search/Elements/BuildFormatString',
     %ARGS, Format => $Format
 );
+
 </%INIT>
 
 <%ARGS>
@@ -103,5 +111,5 @@ $Description => undef
 $Order => undef
 $OrderBy => undef
 $RowsPerPage => undef
+$Reset => undef
 </%ARGS>
-

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