Browse Source

HUE-6670 [oozie] Avoid double modal on bundle submission

Enrico Berti 8 years ago
parent
commit
7ca155a

+ 1 - 1
apps/oozie/src/oozie/static/oozie/css/common-editor.css

@@ -14,4 +14,4 @@ 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.
- */.form-search{margin:0;padding-top:5px}.object-name{font-size:20px;font-weight:300}.object-description{margin-left:10px;font-size:14px}.editable-click{cursor:pointer}.editable-empty,.editable-empty:hover{color:#666 !important;opacity:.55}.tooltip{z-index:1051}.demi-modal{z-index:1033}input[type="text"].filechooser-input{border-right:none;margin-bottom:0}input[type="text"].filechooser-input,input[type="text"].half{width:50%}input[type="text"].seventy,textarea.seventy{width:70% !important}input[type="text"].thirty{width:30% !important}input[type="text"].with-errors,textarea.with-errors{border:solid 1px #EE5F5B}input[type="text"].filechooser-input.input-xlarge{width:270px}#file-uploader{float:left;margin-right:3px;margin-top:10px}ul.with-margin li{margin-bottom:4px}.dropdown-menu li{font-size:14px}.dropdown a.dropdown-toggle{padding-left:10px;padding-right:10px}.search-bar{background-color:#F5F5F5;border-bottom:1px solid #e3e3e3;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065);margin:0;padding:10px;padding-left:20px;padding-right:20px;text-align:left;width:100%;position:fixed;top:72px;z-index:1000}.fields-chooser li{cursor:pointer;margin-bottom:10px}.fields-chooser li .badge{font-weight:normal;font-size:12px}.demi-modal{min-height:80px}#settingsModal h4{margin-top:30px}#settingsModal ul.unstyled li{margin-bottom:4px}.submit-modal .dropdown-menu{box-shadow:0 5px 10px rgba(0,0,0,0.2) !important}
+ */.form-search{margin:0;padding-top:5px}.object-name{font-size:20px;font-weight:300}.object-description{margin-left:10px;font-size:14px}.editable-click{cursor:pointer}.editable-empty,.editable-empty:hover{color:#666 !important;opacity:.55}.tooltip{z-index:1051}.demi-modal{z-index:1033}input[type="text"].filechooser-input{border-right:none;margin-bottom:0}input[type="text"].filechooser-input,input[type="text"].half{width:50%}input[type="text"].seventy,textarea.seventy{width:70% !important}input[type="text"].thirty{width:30% !important}input[type="text"].with-errors,textarea.with-errors{border:solid 1px #EE5F5B}input[type="text"].filechooser-input.input-xlarge{width:270px}#file-uploader{float:left;margin-right:3px;margin-top:10px}ul.with-margin li{margin-bottom:4px}.dropdown-menu li{font-size:14px}.dropdown a.dropdown-toggle{padding-left:10px;padding-right:10px}.search-bar{background-color:#F5F5F5;border-bottom:1px solid #e3e3e3;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065);margin:0;padding:10px;padding-left:20px;padding-right:20px;text-align:left;width:100%;position:fixed;top:72px;z-index:1000}.fields-chooser li{cursor:pointer;margin-bottom:10px}.fields-chooser li .badge{font-weight:normal;font-size:12px}.demi-modal{min-height:80px}#settingsModal h4{margin-top:30px}#settingsModal ul.unstyled li{margin-bottom:4px}.submit-modal .dropdown-menu,.submit-modal-editor .dropdown-menu{box-shadow:0 5px 10px rgba(0,0,0,0.2) !important}

+ 1 - 1
apps/oozie/src/oozie/static/oozie/less/common-editor.less

@@ -131,6 +131,6 @@ ul.with-margin li {
   margin-bottom: 4px;
 }
 
-.submit-modal .dropdown-menu {
+.submit-modal .dropdown-menu, .submit-modal-editor .dropdown-menu {
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2) !important;
 }

+ 3 - 3
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -2380,11 +2380,11 @@ var EditorViewModel = (function() {
                   ko.applyBindings(self.schedulerViewModel, $("#schedulerEditor")[0]);
                   $(document).off("showSubmitPopup");
                   $(document).on("showSubmitPopup", function (event, data) {
-                    $('.submit-modal').html(data);
-                    $('.submit-modal').modal('show');
+                    $('.submit-modal-editor').html(data);
+                    $('.submit-modal-editor').modal('show');
                     var _sel = $('.submit-form .control-group[rel!="popover"]:visible');
                     if (_sel.length > 0) {
-                      $('.submit-modal .modal-body').height($('.submit-modal .modal-body').height() + 60);
+                      $('.submit-modal-editor .modal-body').height($('.submit-modal-editor .modal-body').height() + 60);
                     }
                   });
 

+ 2 - 2
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -1939,7 +1939,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
   <!-- /ko -->
 <!-- /ko -->
 
-<div class="submit-modal modal hide"></div>
+<div class="submit-modal-editor modal hide"></div>
 
 </%def>
 
@@ -3493,7 +3493,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
       huePubSub.subscribe('submit.popup.return', function (data) {
         viewModel.selectedNotebook().viewSchedulerId(data.job_id);
         $.jHueNotify.info('${_('Coordinator submitted.')}');
-        $('.submit-modal').modal('hide');
+        $('.submit-modal-editor').modal('hide');
 
         $('a[href=\'#scheduledJobsTab\']').click();
       }, HUE_PUB_SUB_APP);