فهرست منبع

HUE-2727 [spark] Check if properties exist in the settings modal

This commits adds an existence-check for each property in the settings modal to allow for dynamic properties.

(cherry picked from commit 953e8a4b855e5e95e0d6c3cfe16e6076e90b9b2c)
Johan Ahlen 11 سال پیش
والد
کامیت
9f11904c43
1فایلهای تغییر یافته به همراه11 افزوده شده و 1 حذف شده
  1. 11 1
      apps/spark/src/spark/templates/editor.mako

+ 11 - 1
apps/spark/src/spark/templates/editor.mako

@@ -711,38 +711,48 @@ ${ commonheader(_('Query'), app_name, user, "68px") | n,unicode }
             <!-- ko foreach: sessions -->
             <!-- ko foreach: sessions -->
             <!-- ko with: $data.properties -->
             <!-- ko with: $data.properties -->
             <h4 data-bind="text: $root.getSnippetName($parent.type())" style="clear:left;"></h4>
             <h4 data-bind="text: $root.getSnippetName($parent.type())" style="clear:left;"></h4>
+            <!-- ko if: executor_cores -->
             <div class="control-group" style="float: left;">
             <div class="control-group" style="float: left;">
               <label class="control-label">${_('Executor Cores')}</label>
               <label class="control-label">${_('Executor Cores')}</label>
               <div class="controls">
               <div class="controls">
                 <input class="input-small" type="text" data-bind="numericTextInput: { value: executor_cores, precision: 0 }" />
                 <input class="input-small" type="text" data-bind="numericTextInput: { value: executor_cores, precision: 0 }" />
               </div>
               </div>
             </div>
             </div>
+            <!-- /ko -->
+            <!-- ko if: executor_memory -->
             <div class="control-group" style="float: left;">
             <div class="control-group" style="float: left;">
               <label class="control-label">${_('Executor Memory')}</label>
               <label class="control-label">${_('Executor Memory')}</label>
               <div class="controls">
               <div class="controls">
                 <jvm-memory-input params="value: executor_memory" />
                 <jvm-memory-input params="value: executor_memory" />
               </div>
               </div>
             </div>
             </div>
+            <!-- /ko -->
+            <!-- ko if: executor_count -->
             <div class="control-group" style="float: left;">
             <div class="control-group" style="float: left;">
               <label class="control-label">${_('Executor Count')}</label>
               <label class="control-label">${_('Executor Count')}</label>
               <div class="controls">
               <div class="controls">
                 <input class="input-small" type="text" data-bind="numericTextInput: { value: executor_count, precision: 0 }" />
                 <input class="input-small" type="text" data-bind="numericTextInput: { value: executor_count, precision: 0 }" />
               </div>
               </div>
             </div>
             </div>
+            <!-- /ko -->
+            <!-- ko if: driver_cores -->
             <div class="control-group cl" style="float: left; clear: left;">
             <div class="control-group cl" style="float: left; clear: left;">
               <label class="control-label">${_('Driver Cores')}</label>
               <label class="control-label">${_('Driver Cores')}</label>
               <div class="controls">
               <div class="controls">
                 <input class="input-small" type="text" data-bind="numericTextInput: { value: driver_cores, precision: 0 }" />
                 <input class="input-small" type="text" data-bind="numericTextInput: { value: driver_cores, precision: 0 }" />
               </div>
               </div>
             </div>
             </div>
+            <!-- /ko -->
+            <!-- ko if: driver_memory -->
             <div class="control-group" style="float: left;">
             <div class="control-group" style="float: left;">
               <label class="control-label">${_('Driver Memory')}</label>
               <label class="control-label">${_('Driver Memory')}</label>
               <div class="controls">
               <div class="controls">
                 <jvm-memory-input params="value: driver_memory" />
                 <jvm-memory-input params="value: driver_memory" />
               </div>
               </div>
             </div>
             </div>
+            <!-- /ko -->
             <a style="float: right;" class="btn pointer" title="${ _('Restart Session') }" data-dismiss="modal" rel="tooltip" data-bind="click: function() { $root.selectedNotebook().restartSession($parent) }">
             <a style="float: right;" class="btn pointer" title="${ _('Restart Session') }" data-dismiss="modal" rel="tooltip" data-bind="click: function() { $root.selectedNotebook().restartSession($parent) }">
-              ${ _('Restart Session') }
+              <i class="fa fa-refresh"></i> ${ _('Session') }
             </a>
             </a>
             <!-- /ko -->
             <!-- /ko -->
             <!-- /ko -->
             <!-- /ko -->