Merge pull request #636 from mcvidanagama/master

moving application creation started flag to constants.jag
wso2-attic · Sep 22, 2015 · f2a43d0 · f2a43d0
2 parents aed91ec + b8757e5
commit f2a43d0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/modules/jaggery-apps/appmgt/src/jagg/constants.jag b/modules/jaggery-apps/appmgt/src/jagg/constants.jag
@@ -265,6 +265,9 @@ var MUTUALSSL_HEADER_USERNAME_URL = "http://mutualssl.carbon.wso2.org";
 var CLOUD_HEADER_USERNAME_URL = "http://cloud.carbon.wso2.org/username";
 var CLOUD_HEADER_SECRET_URL = "http://cloud.carbon.wso2.org/secret";
 
+//for application creation started message
+
+var APPLICATION_CREATION_STARTED_FLAG = "appCreationStartedFlag_";
 var PAGES={
  APP_HOME : "APP_HOME",
  USER_HOME : "USER_HOME", 

diff --git a/modules/jaggery-apps/appmgt/src/site/blocks/application/add/ajax/add.jag b/modules/jaggery-apps/appmgt/src/site/blocks/application/add/ajax/add.jag
@@ -81,7 +81,7 @@ var log=new Log();
  response.result = 0;
  }
  // this session parameter is to , show the application creation started message only once
- session.put("appCreationStartedFlag_" + applicationKey, true);
+ session.put(APPLICATION_CREATION_STARTED_FLAG + applicationKey, true);
  print(response);
 
  } catch (e) {
@@ -123,7 +123,7 @@ var log=new Log();
  status = generateValidationResponse(false, msg);
  }
  // this session parameter is to , show the application creation started message only once
- session.put("appCreationStartedFlag_" + applicationKey, true);
+ session.put(APPLICATION_CREATION_STARTED_FLAG + applicationKey, true);
  print(status);
  } else if (action == "uploadExistingApplication") {
  var registryMod = jagg.module("registry");
@@ -189,7 +189,7 @@ var log=new Log();
  response.result = 0;
  }
  // this session parameter is to , show the application creation started message only once
- session.put("appCreationStartedFlag_" + applicationKey, true);
+ session.put(APPLICATION_CREATION_STARTED_FLAG + applicationKey, true);
  print(response);
 
  } catch (e) {

diff --git a/modules/jaggery-apps/appmgt/src/site/themes/default/templates/application/get/template.jag b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/application/get/template.jag
@@ -10,8 +10,8 @@
  var servicePath = appFacURL + getProperty(WEB_CONTEXT_ROOT);
  var iconUrl = appFacURL + getProperty(WEB_CONTEXT_ROOT) + "/site/blocks/application/get/ajax/list.jag?action=getAppIcon&applicationKey=" + applicationKey;
  var applicationInfo = outputs.applicationInfo;
- var appCreationStartedFlag = session.get("appCreationStartedFlag_" + applicationKey);
- session.remove("appCreationStartedFlag_" + applicationKey);
+ var appCreationStartedFlag = session.get(APPLICATION_CREATION_STARTED_FLAG + applicationKey);
+ session.remove(APPLICATION_CREATION_STARTED_FLAG + applicationKey);
  var appName = "";
  if(applicationInfo){
  if (applicationInfo.name) {