Also let the settings be cleared when no authentication is enabled.

hawtio · Nov 4, 2013 · cbd983d · cbd983d
1 parent ed81b5e
commit cbd983d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/hawtio-web/src/main/webapp/app/core/html/preferences.html b/hawtio-web/src/main/webapp/app/core/html/preferences.html
@@ -219,8 +219,8 @@
       <div>
         <p></p>
         <p></p>
-        <strong>Reset All Preferences</strong>
-        <p>Complete wipe your settings and logs you out, returning all settings to their default state when you log back in.</p>
+        <strong>Reset Settings</strong>
+        <p>Wipe settings stored by {{branding.appName}} in your browser's local storage</p>
         <button class="btn btn-danger" ng-click="doReset()">Reset to Defaults</button>
         <p></p>
         <p></p>

diff --git a/hawtio-web/src/main/webapp/app/core/js/preferences.ts b/hawtio-web/src/main/webapp/app/core/js/preferences.ts
@@ -1,6 +1,8 @@
 module Core {
 
-  export function PreferencesController($scope, localStorage, userDetails, jolokiaUrl) {
+  export function PreferencesController($scope, localStorage, userDetails, jolokiaUrl, branding) {
+
+    $scope.branding = branding;
 
     if (!angular.isDefined(localStorage['logLevel'])) {
       localStorage['logLevel'] = '{"value": 2, "name": "INFO"}';
@@ -137,12 +139,18 @@ module Core {
     console.log("logCacheSize " + $scope.logCacheSize);
 
     $scope.doReset = () => {
-      logout(jolokiaUrl, userDetails, localStorage, $scope, () => {
+
+      var doReset = () => {
         localStorage.clear();
         setTimeout(() => {
           window.location.reload();
         }, 10);
-      });
+      };
+      if (Core.isBlank(userDetails.username) && Core.isBlank(userDetails.password)) {
+        doReset();
+      } else {
+        logout(jolokiaUrl, userDetails, localStorage, $scope, doReset);
+      }
     }
   }
 }