You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/09 09:37:47 UTC
[2/8] stratos git commit: Application topology view logic initialized
Application topology view logic initialized
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0e6d0993
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0e6d0993
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0e6d0993
Branch: refs/heads/4.1.0-test
Commit: 0e6d0993945d84737ba54c414bf89d01f2dc9030
Parents: f9fe173
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Tue Dec 9 11:23:44 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Dec 9 14:09:31 2014 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0e6d0993/components/org.apache.stratos.manager.console/console/applications_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag
index f3bb322..cd24ef1 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -32,7 +32,7 @@ var log = new Log("apachestratos.applications_form"),
uriMatcher = new URIMatcher(request.getRequestURI()),
elements = uriMatcher.match('/{context}/applications/{formtype}/'),
breadcrumbPathLevelOne = 'applications',
- formDataEdit = '',
+ formDataEdit = topology_data = '',
isEdit = applicationView = isForm = false,
userPermissions = session.get('PERMISSIONS');
@@ -44,10 +44,11 @@ if (!elements) {
isForm = true;
- if (elements.action != 'new') {
- isEdit = true;
- }else if(elements.formtype == 'applications' && elements.action != 'new'){
+ if (elements.formtype == 'applications' && elements.action != 'new') {
applicationView = true;
+ topology_data = util.RESTCalls.getApplicationTopology(elements.action);
+ }else if(elements.action != 'new'){
+ isEdit = true;
}
}
@@ -87,13 +88,15 @@ switch (formtype) {
default:
error.push({"errorMessage":"Incorrect resource path found"});
}
-
var caramelData = {
breadcrumbPathLevelOne: breadcrumbPathLevelOne,
breadcrumbPathLevelTwo: elements.formtype,
left_menu: leftMenu,
isForm: isForm,
isEdit: isEdit,
+ appName: elements.action,
+ topology_data: JSON.stringify(topology_data),
+ applicationView: applicationView,
formTitle: formTitle,
formDataRaw: JSON.stringify(formDataRaw),
//formDataRaw: JSON.stringify(partition_data.partition[0]),