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

[Maureen Mirville]

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

- Log -----------------------------------------------------------------
commit 605f7559e334a6c8cfabe15f8bf79a03960f1b54
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 264ef46..7f2764f 100644
--- a/share/html/Prefs/SearchOptions.html
+++ b/share/html/Prefs/SearchOptions.html
@@ -58,10 +58,12 @@
             RowsPerPage => $RowsPerPage, 
             OrderBy => $OrderBy, 
             Order => $Order &>
+<& /Elements/Submit, Name => 'SavePreferences', Label => loc('Save Changes') &>
+</form>
+<form>
 % 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>
 my @actions;
@@ -84,6 +86,7 @@ if ($ARGS{'SavePreferences'}) {
 }
 
 # If we're restoring default preferences, delete the user's changes
+
 if ($Reset) {
     my ($ok, $msg) = $session{'CurrentUser'}->UserObj->DeletePreferences("SearchDisplay");
     push @actions, $ok ? loc("Default preferences restored.") : $msg;
@@ -102,6 +105,7 @@ my ( $AvailableColumns, $CurrentFormat );
     '/Search/Elements/BuildFormatString',
     %ARGS, Format => $Format
 );
+
 </%INIT>
 
 <%ARGS>

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