Browse Source

[oozie] Error link to start node disallowed

Error link can be to any other node.
Abraham Elmahrek 12 years ago
parent
commit
740b3cdebd

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

@@ -242,7 +242,7 @@ def _node_relationships(workflow, parent, child_el):
         if name == 'error':
           child, create = Kill.objects.get_or_create(name='kill', workflow=workflow, node_type=Kill.node_type)
         else:
-          raise RuntimeError("Node %s has not been defined" % to)
+          raise RuntimeError(_("Node %s has not been defined") % to)
 
       obj = Link.objects.create(name=name, parent=parent, child=child)
       obj.save()

+ 2 - 2
apps/oozie/src/oozie/templates/editor/action_utils.mako

@@ -46,7 +46,7 @@
           <div class="control-group ">
             <label class="control-label">
               <a href="javascript:void(0);" id="advanced-btn" onclick="$('#node-advanced-container').toggle('hide')">
-                <i class="icon-share-alt"></i> ${ _('advanced') }</a>
+                <i class="icon-share-alt"></i> ${ _('Advanced') }</a>
             </label>
             <div class="controls"></div>
           </div>
@@ -58,7 +58,7 @@
                 <div style="padding-top:4px">
                   <select data-bind="options: $root.context().nodes,
                                      optionsText: function(item) {
-                                       return item.name();
+                                       return (item.name()) ? item.name() : item.node_type() + '-' + item.id();
                                      },
                                      optionsValue: function(item) {
                                        return item.id();

+ 1 - 1
apps/oozie/static/js/workflow.utils.js

@@ -41,7 +41,7 @@ function edit_node_modal(modal, workflow, node, save, cancel, template) {
     nodes: ko.computed({
       read: function() {
         var arr = ko.utils.arrayFilter(workflow.registry.allNodes(), function(_node) {
-          return _node.id() && _node.id() != node.id() && $.inArray(_node.node_type(), ['fork', 'join', 'decision']) == -1;
+          return _node.id() && _node.id() != node.id() && $.inArray(_node.node_type(), ['start']) == -1;
         });
         return arr;
       }