WIP

553c22c9 · Rafael Monnerat · 059cfb4f · 553c22c9 · 553c22c9 · 553c22c9
Commit 553c22c9 authored Sep 08, 2014 by Rafael Monnerat 👻
4 changed files
--- a/dev/slapos_parameter/index.html
+++ b/dev/slapos_parameter/index.html
@@ -13,7 +13,7 @@
    <div>
       <div class="load-schema" 
            data-gadget-url="../slapos_load_schema/index.html"
-            data-gadget-scope="load-schemaparameter" >
+            data-gadget-scope="load-schema" >
       </div>
       <fieldset id="top">
         <label>Software Release URL</label>

--- a/dev/slapos_parameter/parameter_editor.js
+++ b/dev/slapos_parameter/parameter_editor.js
@@ -4,7 +4,6 @@
  "use strict";
  var gk = rJS(window);
-  var json_url = "../slapos_load_schema/schema.json";
  var gadget_path_list = {
        connection: "../slapos_load_schema/index.html"
  };
@@ -56,18 +55,16 @@
      }
  })
  .declareMethod('render', function(options) {
-     if (options.software_release_url === undefined) {
+    if (options.software_release_url === undefined) {
-       throw "undefined software_release_url";
+     throw "undefined software_release_url";
-     }
+    }
-     if (options.json_url === undefined) {
+    if (options.json_url === undefined) {
-       throw "undefined software_release_url";
+      throw "undefined json_url";
-     }
+    }
-     if (options.software_release_json_url === undefined) {
+    var g = this;
-       throw "undefined software_release_url";
+    var json_url = options.json_url;
-     }
-     var g = this;
-    return g.declareGadget(gadget_path_list.connection, {})
+    return g.getDeclaredGadget("load-schema")
    .push(function (gadget) {
      return gadget.loadJSONSchema(json_url);

--- a/dev/slapos_request/index.html
+++ b/dev/slapos_request/index.html
@@ -12,10 +12,16 @@
  </head>
  <body>
    <div>
+       <div class="software-type" 
+            data-gadget-url="../slapos_parameter/index.html"
+            data-gadget-scope="software-type" >
+       </div>
       <div class="parameter" 
            data-gadget-url="../slapos_parameter/index.html"
            data-gadget-scope="parameter" >
      </div>
      <button class="update-button" > Update </button>
      <div class="debug"> </div>

--- a/dev/slapos_request/slapos_request.js
+++ b/dev/slapos_request/slapos_request.js
@@ -6,7 +6,6 @@
  var gk = rJS(window);
  var json_url = "../slapos_load_schema/schema.json";
  var gadget_path_list = {
-        parameter: "../slapos_parameter/index.html",
        connection: "../slapos_load_schema/index.html"
  };
@@ -15,12 +14,22 @@
       throw "undefined software_release_url";
     }
     var g = this;
-     var gadget = this.getDeclaredGadget('parameter')
+     this.getDeclaredGadget('software-type')
     .push(function(gadget) {
-       options[json_url] = json_url;
+       options.json_url = "../slapos_load_schema/software_type.json";
-       options[software_type_json_url] = software_type_json_url;  
       return gadget.render(options);
-       });
+       })
+      .push(function() {
+        g.getDeclaredGadget('parameter')
+        .push(function(gadget) {
+            options.json_url = json_url;
+            return gadget.render(options);
+        });   
+      });
      var gadget_promise = g.declareGadget(gadget_path_list.connection, {});