remove coresitedeployment from xoslib

[plstackapi.git] / planetstack / core / xoslib / static / js / xosAdminSite.js

diff --git a/planetstack/core/xoslib/static/js/xosAdminSite.js b/planetstack/core/xoslib/static/js/xosAdminSite.js
index 5274a81..833f40d 100644 (file)
--- a/planetstack/core/xoslib/static/js/xosAdminSite.js
+++ b/planetstack/core/xoslib/static/js/xosAdminSite.js
@@ -1,4 +1,5 @@
-OBJS = ['deployment', 'image', 'networkTemplate', 'network', 'networkSliver', 'networkDeployment', 'node', 'service', 'site', 'slice', 'sliceDeployment', 'slicePrivilege', 'sliver', 'user', 'sliceRole', 'userDeployment'];
+OBJS = ['deployment', 'image', 'networkTemplate', 'network', 'networkSliver', 'node', 'service', 'site', 'slice',  'slicePrivilege', 'sliver', 'user', 'sliceRole',  'flavor', 'controller', 'siteDeployment'];
+// 'networkDeployment', 'userDeployment', 'sliceDeployment', 'imageDeployment'
 NAV_OBJS = ['deployment', 'site', 'slice', 'user'];
 
 REWRITES = {"/admin/core/deployment/": "#deployments",
@@ -21,17 +22,20 @@ XOSAdminApp.addRegions({
     linkedObjs3: "#linkedObjs3",
     linkedObjs4: "#linkedObjs4",
 
-    addChildDetail: "#xos-addchild-detail"
+    addChildDetail: "#xos-addchild-detail",
+
+    rightButtonPanel: "#rightButtonPanel"
 });
 
 XOSAdminApp.navigate = function(what, modelName, modelId) {\r
+    console.log("XOSAsminApp.navigate");\r
     collection_name = modelName + "s";\r
     if (what=="list") {\r
         XOSAdminApp.Router.navigate(collection_name, {trigger: true})\r
     } else if (what=="detail") {\r
         XOSAdminApp.Router.navigate(collection_name + "/" + modelId, {trigger: true})\r
     } else if (what=="add") {\r
-        XOSAdminApp.Router.navigate("add" + firstCharUpper(modelName), {trigger: true})\r
+        XOSAdminApp.Router.navigate("add" + firstCharUpper(modelName), {trigger: true, force: true})\r
     }\r
 }\r
 \r
@@ -69,8 +73,10 @@ XOSAdminApp.buildViews = function() {
                                                 app: XOSAdminApp});\r
      XOSAdminApp["genericItemView"] = genericItemViewClass;\r
 \r
-     genericListViewClass = XOSListView.extend({template: "#xos-list-template",\r
-                                                app: XOSAdminApp});\r
+     //genericListViewClass = XOSListView.extend({template: "#xos-list-template",\r
+     //                                           app: XOSAdminApp});\r
+\r
+     genericListViewClass = XOSDataTableView.extend({template: "#xos-list-template", app: XOSAdminApp});\r
      XOSAdminApp["genericListView"] = genericListViewClass;\r
 \r
      for (var index in OBJS) {\r
@@ -82,23 +88,29 @@ XOSAdminApp.buildViews = function() {
          collection_name = name + "s";
          region_name = name + "List";
 
+         if (window["XOSDetailView_" + name]) {
+             detailClass = window["XOSDetailView_" + name].extend({template: "#xos-detail-template",
+                                                                    app: XOSAdminApp});
+         } else {
+             detailClass = genericDetailClass;
+         }
          if ($(detail_template).length) {
-             detailClass = XOSDetailView.extend({
+             detailClass = detailClass.extend({
                 template: detail_template,\r
-                app: XOSAdminApp,\r
              });\r
-         } else {\r
-             detailClass = genericDetailClass;\r
          }\r
          XOSAdminApp[collection_name + "DetailView"] = detailClass;\r
 \r
-         if ($(add_child_template).length) {\r
-             addClass = XOSDetailView.extend({
+         if (window["XOSDetailView_" + name]) {\r
+             addClass = window["XOSDetailView_" + name].extend({template: "#xos-add-template",
+                                                                    app: XOSAdminApp});
+         } else {
+             addClass = genericAddChildClass;
+         }
+         if ($(add_child_template).length) {
+             addClass = detailClass.extend({
                 template: add_child_template,\r
-                app: XOSAdminApp,\r
              });\r
-         } else {\r
-             addClass = genericAddChildClass;\r
          }\r
          XOSAdminApp[collection_name + "AddChildView"] = addClass;\r
 \r