#3 - panel now refreshes on login, page no longer refreshes on login.

cassproject · Jan 9, 2018 · 358aeff · 358aeff
1 parent 21d231d
commit 358aeff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/docs/generated-js/competencies.us.js b/docs/generated-js/competencies.us.js
@@ -5043,7 +5043,8 @@ var AppMenu = (function (AppMenu) {
 
     }
 
-    function attemptLogin(){
+    function attemptLogin(event){
+    	event.preventDefault();
         var userId = $("#appMenuLoginUser").val();
         var password = $("#appMenuLoginPass").val();
         var server = $("#sessionLoginSelect").val();
@@ -5078,6 +5079,8 @@ var AppMenu = (function (AppMenu) {
                 $("#appMenuLoginUser").removeAttr("disabled").val("");
                 $("#appMenuLoginPass").removeAttr("disabled").val("");
                 $("#sessionLoginSelect").find("option").not("[value]").prop("selected", "true");
+
+				ScreenManager.reloadCurrentScreen();
             });
         }, function(err){
             $("#appMenuLoginUser").addClass("error");
@@ -5086,7 +5089,10 @@ var AppMenu = (function (AppMenu) {
             $("#appMenuLoginSpinner").addClass("hide");
             $("#appMenuLoginUser").removeAttr("disabled");
             $("#appMenuLoginPass").removeAttr("disabled");
+
+			ScreenManager.reloadCurrentScreen();
         });
+
     }
 
     function setupMenuButtons(){

diff --git a/src/main/js/other/AppMenu.js b/src/main/js/other/AppMenu.js
@@ -269,7 +269,8 @@ var AppMenu = (function (AppMenu) {
 
     }
 
-    function attemptLogin(){
+    function attemptLogin(event){
+    	event.preventDefault();
         var userId = $("#appMenuLoginUser").val();
         var password = $("#appMenuLoginPass").val();
         var server = $("#sessionLoginSelect").val();
@@ -304,6 +305,8 @@ var AppMenu = (function (AppMenu) {
                 $("#appMenuLoginUser").removeAttr("disabled").val("");
                 $("#appMenuLoginPass").removeAttr("disabled").val("");
                 $("#sessionLoginSelect").find("option").not("[value]").prop("selected", "true");
+
+				ScreenManager.reloadCurrentScreen();
             });
         }, function(err){
             $("#appMenuLoginUser").addClass("error");
@@ -312,7 +315,10 @@ var AppMenu = (function (AppMenu) {
             $("#appMenuLoginSpinner").addClass("hide");
             $("#appMenuLoginUser").removeAttr("disabled");
             $("#appMenuLoginPass").removeAttr("disabled");
+
+			ScreenManager.reloadCurrentScreen();
         });
+
     }
 
     function setupMenuButtons(){