Browse Source

[oozie] Add name of job in submission popup

Romain Rigaux 11 năm trước cách đây
mục cha
commit
6404e3640f

+ 14 - 52
apps/oozie/src/oozie/templates/editor/submit_job_popup.mako

@@ -21,14 +21,14 @@
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
-<form action="${ action }" method="POST" class="form-horizontal submit-form">
+<form action="${ action }" method="POST">
   ${ csrf_token(request) | n,unicode }
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
-    <h3>${ _('Submit this job?') }</h3>
+    <h3>${ _('Submit %(job)s?') % {'job': name} }</h3>
   </div>
   <div class="modal-body">
-    
+    <fieldset>
       <div id="param-container">
 
        ${ params_form.management_form | n,unicode }
@@ -37,64 +37,26 @@
           % for hidden in form.hidden_fields():
             ${ hidden | n,unicode }
           % endfor
-
-          <div class="control-group
-          % if form['name'].form.initial.get('name') == 'oozie.use.system.libpath':
+          <div class="fieldWrapper">
+            <div class="row-fluid
+              % if form['name'].form.initial.get('name') == 'oozie.use.system.libpath':
                 hide
               % endif
-          ">
-            <label class="control-label">${ form['name'].form.initial.get('name') }</label>
-            <div class="controls">
-              ${ utils.render_field(form['value'], show_label=False, extra_attrs={'class': 'filechooser-input input-xlarge'}) }
-              <div class="btn-group">
-              <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
-                        aria-expanded="false">
-                  <i class="fa fa-calendar"></i>
-                  <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu" role="menu">
-                  <li>
-                    <a class="pointer now-link">
-                      ${ _('Now') }
-                    </a>
-                    <a class="pointer calendar-link">
-                      ${ _('Calendar') }
-                    </a>
-                  </li>
-                </ul>
-                </div>
+              ">
+              <div class="span6">
+                ${ form['name'].form.initial.get('name') }
+              </div>
+              <div class="span6">
+                ${ utils.render_field(form['value'], show_label=False) }
+              </div>
             </div>
           </div>
-
          % endfor
       </div>
-
+    </fieldset>
   </div>
   <div class="modal-footer">
     <a href="#" class="btn" data-dismiss="modal">${ _('Cancel') }</a>
     <input id="submit-btn" type="submit" class="btn btn-primary" value="${ _('Submit') }"/>
   </div>
 </form>
-
-<script type="text/javascript">
-  $('.submit-form .filechooser-input').each(function(){
-      $(this).after(getFileBrowseButton($(this), true, null, true));
-  });
-
-  $(".now-link").on("click", function(){
-    $(this).parents(".controls").find("input[type='text']").val(moment().format("YYYY-MM-DD[T]HH:mm:SS"));
-  });
-
-  $(".calendar-link").on("click", function(){
-    var DATE_FORMAT = "YYYY-MM-DD";
-    var _el = $(this).parents(".controls").find("input[type='text']");
-    _el.datepicker({
-      format: DATE_FORMAT.toLowerCase()
-     }).on("changeDate", function () {
-      _el.datepicker('hide');
-      _el.val(_el.val() + "T00:00:00");
-    });
-   _el.datepicker('show');
-  }); 
-</script>
-

+ 100 - 0
apps/oozie/src/oozie/templates/editor/submit_job_popup2.mako

@@ -0,0 +1,100 @@
+## Licensed to Cloudera, Inc. under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  Cloudera, Inc. licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
+<%!
+  from django.utils.translation import ugettext as _
+%>
+
+<%namespace name="utils" file="../utils.inc.mako" />
+
+
+<form action="${ action }" method="POST" class="form-horizontal submit-form">
+  ${ csrf_token(request) | n,unicode }
+  <div class="modal-header">
+    <a href="#" class="close" data-dismiss="modal">&times;</a>
+    <h3>${ _('Submit %(job)s?') % {'job': name} }</h3>
+  </div>
+  <div class="modal-body">
+    
+      <div id="param-container">
+
+       ${ params_form.management_form | n,unicode }
+
+       % for form in params_form.forms:
+          % for hidden in form.hidden_fields():
+            ${ hidden | n,unicode }
+          % endfor
+
+          <div class="control-group
+          % if form['name'].form.initial.get('name') == 'oozie.use.system.libpath':
+                hide
+              % endif
+          ">
+            <label class="control-label">${ form['name'].form.initial.get('name') }</label>
+            <div class="controls">
+              ${ utils.render_field(form['value'], show_label=False, extra_attrs={'class': 'filechooser-input input-xlarge'}) }
+              <div class="btn-group">
+              <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
+                        aria-expanded="false">
+                  <i class="fa fa-calendar"></i>
+                  <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu" role="menu">
+                  <li>
+                    <a class="pointer now-link">
+                      ${ _('Now') }
+                    </a>
+                    <a class="pointer calendar-link">
+                      ${ _('Calendar') }
+                    </a>
+                  </li>
+                </ul>
+                </div>
+            </div>
+          </div>
+
+         % endfor
+      </div>
+
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal">${ _('Cancel') }</a>
+    <input id="submit-btn" type="submit" class="btn btn-primary" value="${ _('Submit') }"/>
+  </div>
+</form>
+
+<script type="text/javascript">
+  $('.submit-form .filechooser-input').each(function(){
+      $(this).after(getFileBrowseButton($(this), true, null, true));
+  });
+
+  $(".now-link").on("click", function(){
+    $(this).parents(".controls").find("input[type='text']").val(moment().format("YYYY-MM-DD[T]HH:mm:SS"));
+  });
+
+  $(".calendar-link").on("click", function(){
+    var DATE_FORMAT = "YYYY-MM-DD";
+    var _el = $(this).parents(".controls").find("input[type='text']");
+    _el.datepicker({
+      format: DATE_FORMAT.toLowerCase()
+     }).on("changeDate", function () {
+      _el.datepicker('hide');
+      _el.val(_el.val() + "T00:00:00");
+    });
+   _el.datepicker('show');
+  }); 
+</script>
+

+ 3 - 0
apps/oozie/src/oozie/views/editor.py

@@ -355,6 +355,7 @@ def submit_workflow(request, workflow):
 
   popup = render('editor/submit_job_popup.mako', request, {
                    'params_form': params_form,
+                   'name': workflow.name,
                    'action': reverse('oozie:submit_workflow', kwargs={'workflow': workflow.id})
                  }, force_template=True).content
   return HttpResponse(json.dumps(popup), mimetype="application/json")
@@ -653,6 +654,7 @@ def submit_coordinator(request, coordinator):
 
   popup = render('editor/submit_job_popup.mako', request, {
                  'params_form': params_form,
+                 'name': coordinator.name,
                  'action': reverse('oozie:submit_coordinator',  kwargs={'coordinator': coordinator.id})
                 }, force_template=True).content
   return HttpResponse(json.dumps(popup), mimetype="application/json")
@@ -862,6 +864,7 @@ def submit_bundle(request, bundle):
 
   popup = render('editor/submit_job_popup.mako', request, {
                  'params_form': params_form,
+                 'name': bundle.name,
                  'action': reverse('oozie:submit_bundle',  kwargs={'bundle': bundle.id})
                 }, force_template=True).content
   return HttpResponse(json.dumps(popup), mimetype="application/json")

+ 6 - 3
apps/oozie/src/oozie/views/editor2.py

@@ -317,8 +317,9 @@ def submit_workflow(request, doc_id):
     initial_params = ParameterForm.get_initial_params(dict([(param['name'], param['value']) for param in parameters]))
     params_form = ParametersFormSet(initial=initial_params)
 
-    popup = render('editor/submit_job_popup.mako', request, {
+    popup = render('editor/submit_job_popup2.mako', request, {
                      'params_form': params_form,
+                     'name': workflow.name,
                      'action': reverse('oozie:editor_submit_workflow', kwargs={'doc_id': workflow.id})
                    }, force_template=True).content
     return HttpResponse(json.dumps(popup), mimetype="application/json")
@@ -484,8 +485,9 @@ def submit_coordinator(request, doc_id):
     initial_params = ParameterForm.get_initial_params(dict([(param['name'], param['value']) for param in parameters]))
     params_form = ParametersFormSet(initial=initial_params)
 
-  popup = render('editor/submit_job_popup.mako', request, {
+  popup = render('editor/submit_job_popup2.mako', request, {
                  'params_form': params_form,
+                 'name': coordinator.name,
                  'action': reverse('oozie:editor_submit_coordinator',  kwargs={'doc_id': coordinator.id})
                 }, force_template=True).content
   return HttpResponse(json.dumps(popup), mimetype="application/json")
@@ -629,8 +631,9 @@ def submit_bundle(request, doc_id):
     initial_params = ParameterForm.get_initial_params(dict([(param['name'], param['value']) for param in parameters]))
     params_form = ParametersFormSet(initial=initial_params)
 
-  popup = render('editor/submit_job_popup.mako', request, {
+  popup = render('editor/submit_job_popup2.mako', request, {
                  'params_form': params_form,
+                 'name': bundle.name,
                  'action': reverse('oozie:editor_submit_bundle',  kwargs={'doc_id': bundle.id})
                 }, force_template=True).content
   return HttpResponse(json.dumps(popup), mimetype="application/json")