浏览代码

[oozie] UX of Ssh action

Romain Rigaux 11 年之前
父节点
当前提交
888a292
共有 2 个文件被更改,包括 8 次插入3 次删除
  1. 1 1
      apps/oozie/src/oozie/models2.py
  2. 7 2
      apps/oozie/src/oozie/templates/editor/workflow_editor.mako

+ 1 - 1
apps/oozie/src/oozie/models2.py

@@ -856,7 +856,7 @@ class SshAction(Action):
           'label': _('User and Host'),
           'value': 'user@host.com',
           'help_text': _('Where the shell will be executed.'),
-          'type': ''
+          'type': 'text'
      },         
      'ssh_command': { 
           'name': 'ssh_command',

+ 7 - 2
apps/oozie/src/oozie/templates/editor/workflow_editor.mako

@@ -1159,12 +1159,12 @@ ${ commonheader(_("Workflow Editor"), "Oozie", user, "40px") | n,unicode }
   <!-- ko if: $root.workflow.getNodeById(id()) -->
   <div class="row-fluid" data-bind="with: $root.workflow.getNodeById(id())" style="padding: 10px">
     <div data-bind="visible: $root.isEditing">
-      <input type="text" data-bind="value: id" />
-      <input type="text" data-bind="value: name" />
+
       <div data-bind="visible: ! $parent.ooziePropertiesExpanded()">
         <span data-bind="text: $root.workflow_properties.host.label"></span>
         <input type="text" data-bind="value: properties.host" />
         <br/>
+        
         <span data-bind="text: $root.workflow_properties.ssh_command.label"></span>
         <input type="text" data-bind="value: properties.ssh_command" />
         <div class="row-fluid">
@@ -1172,6 +1172,11 @@ ${ commonheader(_("Workflow Editor"), "Oozie", user, "40px") | n,unicode }
         </div>
       </div>
     </div>
+    
+    <div data-bind="visible: ! $root.isEditing()">
+      <span data-bind="text: properties.host" />
+      <span data-bind="text: properties.ssh_command().slice(0, 75)" />
+    </div> 
 
     <div data-bind="visible: $parent.ooziePropertiesExpanded">
       <ul class="nav nav-tabs">