浏览代码

HUE-4530 [indexer] Move format selection to step 2

Romain Rigaux 9 年之前
父节点
当前提交
364aff0
共有 2 个文件被更改,包括 13 次插入13 次删除
  1. 1 1
      apps/oozie/src/oozie/models2_tests.py
  2. 12 12
      desktop/libs/indexer/src/indexer/templates/indexer.mako

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

@@ -996,4 +996,4 @@ class TestModelAPI(OozieMockBase):
 
     assert_equal(len(_data['workflow']['nodes']), 5)
     assert_equal(len(re.findall('<ok to="doc-hive-', workflow.to_xml())), 1, workflow.to_xml())
-    assert_equal(len(re.findall('<action name="doc-hive->', workflow.to_xml())), 2, workflow.to_xml())
+    assert_equal(len(re.findall('<action name="doc-hive-', workflow.to_xml())), 2, workflow.to_xml())

+ 12 - 12
desktop/libs/indexer/src/indexer/templates/indexer.mako

@@ -208,20 +208,20 @@ ${ assist.assistPanel() }
       </div>
     </div>
 
-
-    <div data-bind="visible: createWizard.fileFormat().show">
-      <h3>
-        ${_('File Type')}: <select data-bind="options: $root.createWizard.fileTypes, optionsText: 'description', value: $root.createWizard.fileType"></select>
-      </h3>
-      <div data-bind="with: createWizard.fileFormat().format">
-        <!-- ko template: {name: 'format-settings'}--><!-- /ko -->
-      </div>
-    </div>
     <!-- /ko -->
 
 
-        <!-- ko if: createWizard.fileFormat().format() && createWizard.fileFormat().format().isCustomizable() -->
-          <!-- ko if: currentStep() == 2 -->
+      <!-- ko if: createWizard.fileFormat().format() && createWizard.fileFormat().format().isCustomizable() -->
+        <!-- ko if: currentStep() == 2 -->
+          <div data-bind="visible: createWizard.fileFormat().show">
+            <h3>
+              ${_('File Type')}: <select data-bind="options: $root.createWizard.fileTypes, optionsText: 'description', value: $root.createWizard.fileType"></select>
+            </h3>
+            <div data-bind="with: createWizard.fileFormat().format">
+              <!-- ko template: {name: 'format-settings'}--><!-- /ko -->
+            </div>
+          </div>
+
           <h3>${_('Fields')}</h3>
           <!-- ko if: createWizard.isGuessingFieldTypes -->
             <i class="fa fa-spinner fa-spin"></i>
@@ -257,8 +257,8 @@ ${ assist.assistPanel() }
               </tbody>
             </table>
           </div>
-          <!-- /ko -->
         <!-- /ko -->
+      <!-- /ko -->
 
 
       <!-- ko if: previousStepVisible -->