commit 0bf96b21ae0395e710d7b49408dd8c9d1276cf95
author Scott Baker <smbaker@gmail.com> Tue Nov 04 15:41:47 2014 -0800
committer Scott Baker <smbaker@gmail.com> Tue Nov 04 15:41:47 2014 -0800
tree 885026956a3030d9f398ae9ac622ce25dbd00c77
parent 90004d5c99da607566f936e0f0b0c324d8ab8c89

modelName in xos models, log window, deferred display of detail when collection not ready, beef up detailShower/listViewShower

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 3d87ca6..660556e 100644
--- a/planetstack/core/xoslib/static/js/xosAdminSite.js
+++ b/planetstack/core/xoslib/static/js/xosAdminSite.js
@@ -1,13 +1,7 @@
 OBJS = ['deployment', 'image', 'networkTemplate', 'network', 'networkSliver', 'networkDeployment', 'node', 'service', 'site', 'slice', 'sliceDeployment', 'slicePrivilege', 'sliver', 'user', 'sliceRole', 'userDeployment'];
 NAV_OBJS = ['deployment', 'site', 'slice', 'user'];
 
-function assert(outcome, description) {
-    if (!outcome) {
-        console.log(description);
-    }
-}
-
-XOSAdminApp = new XOSApplication();
+XOSAdminApp = new XOSApplication({logTableId: "#logTable"});
 
 XOSAdminApp.addRegions({
     navigation: "#navigationPanel",
@@ -32,7 +26,6 @@
     for (var index in NAV_OBJS) {

         name = NAV_OBJS[index];

         collection_name = name+"s";

-        //nav_url = "/" + collection_name;

         nav_url = "#" + collection_name;

         id = "nav-"+name;

         icon_class = ICON_CLASSES[collection_name] || "icon-cog";

@@ -89,27 +82,6 @@
     var api = {};

     var routes = {};

 

-    function listViewShower(listViewName) {

-        return function() {

-            XOSAdminApp.detail.show(new XOSAdminApp[listViewName]);

-        }

-    };

-

-    function detailShower(detailName, collection_name) {

-        shower = function(model_id) {

-            model = xos[collection_name].get(model_id);

-            if (model == undefined) {

-                $("#detail").html("not ready yet");

-                return;

-            }

-            detailViewClass = XOSAdminApp[detailName];

-            detailView = new detailViewClass({model: model});

-            XOSAdminApp.detail.show(detailView);

-            detailView.showLinkedItems();

-        }

-        return shower;

-    };

-

     for (var index in OBJS) {

         name = OBJS[index];

         collection_name = name + "s";

@@ -118,13 +90,13 @@
         listViewName = collection_name + "ListView";

         detailViewName = collection_name + "DetailView";

 

-        api[api_command] = listViewShower(listViewName);

+        api[api_command] = XOSAdminApp.listViewShower(listViewName, "detail");

         routes[nav_url] = api_command;

 

         nav_url = collection_name + "/:id";

         api_command = "detail" + collection_name.charAt(0).toUpperCase() + collection_name.slice(1);

 

-        api[api_command] = detailShower(detailViewName, collection_name);

+        api[api_command] = XOSAdminApp.detailShower(detailViewName, collection_name, "detail");

         routes[nav_url] = api_command;

     };