B #4132: remove values in vm template (#4260)

Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
2025-01-26 10:03:37 +03:00 · 2020-02-25 18:23:49 +01:00 · 2020-02-25 18:23:49 +01:00 · 4fb54f5dc4
commit 4fb54f5dc4
parent 5235aa8323
14 changed files with 40 additions and 21 deletions
--- a/src/sunstone/etc/sunstone-views/kvm/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/kvm/admin.yaml
@ -472,7 +472,7 @@ tabs:
            Service.chgrp: true
            Service.chmod: true
            Service.rename: true
-            Service.shutdown: true
+            Service.shutdown: false
            Service.recover: true
            Service.delete: true
            Service.edit_labels: true
--- a/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml
@ -471,7 +471,7 @@ tabs:
            Service.chgrp: false
            Service.chmod: false
            Service.rename: true
-            Service.shutdown: true
+            Service.shutdown: false
            Service.recover: true
            Service.delete: true
            Service.edit_labels: true
--- a/src/sunstone/etc/sunstone-views/kvm/user.yaml
+++ b/src/sunstone/etc/sunstone-views/kvm/user.yaml
@ -464,7 +464,7 @@ tabs:
            Service.chgrp: false
            Service.chmod: true
            Service.rename: true
-            Service.shutdown: true
+            Service.shutdown: false
            Service.recover: true
            Service.delete: true
            Service.edit_labels: true
--- a/src/sunstone/etc/sunstone-views/mixed/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/mixed/admin.yaml
@ -472,7 +472,7 @@ tabs:
            Service.chgrp: true
            Service.chmod: true
            Service.rename: true
-            Service.shutdown: true
+            Service.shutdown: false
            Service.recover: true
            Service.delete: true
            Service.edit_labels: true
--- a/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml
@ -471,7 +471,7 @@ tabs:
            Service.chgrp: false
            Service.chmod: false
            Service.rename: true
-            Service.shutdown: true
+            Service.shutdown: false
            Service.recover: true
            Service.delete: true
            Service.edit_labels: true
--- a/src/sunstone/etc/sunstone-views/mixed/user.yaml
+++ b/src/sunstone/etc/sunstone-views/mixed/user.yaml
@ -464,7 +464,7 @@ tabs:
            Service.chgrp: false
            Service.chmod: true
            Service.rename: true
-            Service.shutdown: true
+            Service.shutdown: false
            Service.recover: true
            Service.delete: true
            Service.edit_labels: true
--- a/src/sunstone/etc/sunstone-views/vcenter/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/vcenter/admin.yaml
@ -470,7 +470,7 @@ tabs:
            Service.chgrp: true
            Service.chmod: true
            Service.rename: true
-            Service.shutdown: true
+            Service.shutdown: false
            Service.recover: true
            Service.delete: true
            Service.edit_labels: true
--- a/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml
@ -471,7 +471,7 @@ tabs:
            Service.chgrp: false
            Service.chmod: false
            Service.rename: true
-            Service.shutdown: true
+            Service.shutdown: false
            Service.recover: true
            Service.delete: true
            Service.edit_labels: true
--- a/src/sunstone/etc/sunstone-views/vcenter/user.yaml
+++ b/src/sunstone/etc/sunstone-views/vcenter/user.yaml
@ -464,7 +464,7 @@ tabs:
            Service.chgrp: false
            Service.chmod: true
            Service.rename: true
-            Service.shutdown: true
+            Service.shutdown: false
            Service.recover: true
            Service.delete: true
            Service.edit_labels: true
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js
@ -91,7 +91,9 @@ define(function(require) {
      'customTagsTableHTML': CustomTagsTable.html(
        CustomClassCustomAttrs,
        CustomClassCustomAttrsButton, 
-        true
+        true,
+        true, //mandatory
+        true, //default
      )
    });
  }
@ -188,7 +190,6 @@ define(function(require) {

    // Add first role
    $("#tf_btn_roles", context).trigger("click");
-
    Tips.setup(context);
    CustomTagsTable.setup(context, true);
    return false;
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs
@ -65,7 +65,6 @@
      {{{customTagsTableHTML}}}
    {{/advancedSection}}
  </div>
-  <br>
  {{#advancedSection (tr "Advanced service parameters") }}
  <div class="row">
    <div class="service_template_param st_man medium-6 columns">
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
@ -80,6 +80,7 @@ define(function(require) {
   */

  function _html() {
+    CustomTagsTable.reset();
    return TemplateHTML({
      'uniqueId': UniqueId.id(),
      'userInputsHTML': UserInputs.html(),
@ -151,6 +152,7 @@ define(function(require) {
    });

    UserInputs.setup(context);
+    CustomTagsTable.reset();
    CustomTagsTable.setup(context, true);

    var selectOptions = {
--- a/src/sunstone/public/app/utils/custom-tags-table.js
+++ b/src/sunstone/public/app/utils/custom-tags-table.js
@ -26,17 +26,32 @@ define(function(require) {
  var Sunstone = require('sunstone');
  var removedStyles = false;

-  function _html(classTable, classButton, removeStyles){
+  var showMandatory = false;
+  var showDefault = false;
+
+  function _reset(){
+    showDefault = false;
+    showMandatory = false;
+  }
+
+  function _html(classTable, classButton, removeStyles, mandatory, deflt){
    var classTableName = classTable && classTable.length>0 ? classTable : '';
    var classButtonName = classButton && classButton.length>0 ? classButton : '';
+    if(mandatory){
+      showMandatory = true;
+    }
+    if(deflt){
+      showDefault = true;
+    }
    if(removeStyles){
      removedStyles = removeStyles;
    }
+
    return TemplateHTML({
      'titleKey': Locale.tr("Name"),
-      'titleMandatory': Locale.tr("Type"),
+      'titleMandatory': showMandatory ? Locale.tr("Type") : '',
      'titleValue': Locale.tr("Description"),
-      'titleDefault': Locale.tr("Default Value"),
+      'titleDefault': showDefault? Locale.tr("Default Value"): '',
      'classTable': classTableName,
      'classButton': classButtonName
    });
@ -46,13 +61,14 @@ define(function(require) {
    if (!hide_vector_button) {
      hide_vector_button = false;
    }
+    console.log("VALIDATE: ",showMandatory? 'M' : '');
    context.off("click", ".add_custom_tag");
    context.on("click", ".add_custom_tag", function(){
      $("tbody.custom_tags", context).append(
        RowTemplateHTML({
          styles: !removedStyles,
-          mandatory: 'M',
-          valueDefault: ' '
+          mandatory: showMandatory? 'M' : '',
+          valueDefault: showDefault? ' ' : ''
        })
      );
      if(hide_vector_button){
@ -156,8 +172,8 @@ define(function(require) {
          RowTemplateHTML({
            key: key,
            value: val,
-            mandatory: 'M',
-            valueDefault: ' '
+            mandatory: showMandatory ? 'M': '',
+            valueDefault: showDefault? ' ': ''
          })
        );
      }
@ -168,6 +184,7 @@ define(function(require) {
    'html': _html,
    'setup': _setup,
    'retrieve': _retrieveCustomTags,
-    'fill': _fillCustomTags
+    'fill': _fillCustomTags,
+    'reset': _reset
  };
 });
--- a/src/sunstone/public/bower.json
+++ b/src/sunstone/public/bower.json
@ -9,7 +9,7 @@
    "flot.tooltip": "0.8.4",
    "no-vnc": "https://github.com/novnc/noVNC.git#9fe2fd04d4",
    "resumablejs": "https://github.com/23/resumable.js.git#420cd351c5",
-    "spice-html5": "https://github.com/freedesktop/spice-html5.git#spice-html5-0.1.6",
+    "spice-html5": "https://github.com/freedesktop/spice-html5.git#spice-html5-0.1.7",
    "require-handlebars-plugin": "0.11.2",
    "almond": "0.3.1",
    "vis": "4.12.0",