浏览代码

Merge pull request #6942 from miguelvazq/HPCC-11949.1

HPCC-11949 - Add ability to modify WU scope in ECLWatch

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 10 年之前
父节点
当前提交
56e594f8ac
共有 2 个文件被更改,包括 7 次插入3 次删除
  1. 4 0
      esp/src/eclwatch/WUDetailsWidget.js
  2. 3 3
      esp/src/eclwatch/templates/WUDetailsWidget.html

+ 4 - 0
esp/src/eclwatch/WUDetailsWidget.js

@@ -141,6 +141,7 @@ define([
             var protectedCheckbox = registry.byId(this.id + "Protected");
             var context = this;
             this.wu.update({
+                Scope: dom.byId(context.id + "Scope").value,
                 Description: dom.byId(context.id + "Description").value,
                 Jobname: dom.byId(context.id + "Jobname").value,
                 Protected: protectedCheckbox.get("value")
@@ -432,6 +433,9 @@ define([
                 this.refreshActionState();
             } else if (name === "hasCompleted") {
                 this.checkIfComplete();
+            } else if (name === "Scope" && newValue) {
+                domClass.remove("scopeOptional", "hidden");
+                domClass.add("scopeOptional", "show");
             }
             if (name === "changedCount" && newValue > 0) {
                 var getInt = function (item) {

+ 3 - 3
esp/src/eclwatch/templates/WUDetailsWidget.html

@@ -63,9 +63,9 @@
                                 <label class="Prompt" for="${id}Owner">${i18n.Owner}:</label>
                                 <div id="${id}Owner"></div>
                             </li>
-                            <li>
+                            <li id="scopeOptional" class="hidden">
                                 <label class="Prompt" for="${id}Scope">${i18n.Scope}:</label>
-                                <div id="${id}Scope"></div>
+                                <div><input id="${id}Scope" data-dojo-props="trim:true" data-dojo-type="dijit.form.TextBox"/></div>
                             </li>
                             <li>
                                 <label class="Prompt" for="${id}Jobname">${i18n.JobName}:</label>
@@ -133,4 +133,4 @@
             <button class="bottomFormButtons" data-dojo-attach-event="onClick:_onCancelDialog" data-dojo-type="dijit.form.Button">${i18n.Cancel}</button>
         </form>
     </div>
-</div>
+</div>