ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AmbariAMBARI-18105. JS error on opening Select Alert Group Definitions dialog (onechiporenko)
Date Wed, 10 Aug 2016 15:40:19 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 60baa1eb0 -> 7c19dbcdb


AmbariAMBARI-18105. JS error on opening Select Alert Group Definitions dialog (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7c19dbcd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c19dbcd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c19dbcd

Branch: refs/heads/branch-2.4
Commit: 7c19dbcdb452015176c7a35fdaf2e7afd4ea0dc7
Parents: 60baa1e
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Wed Aug 10 18:35:23 2016 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Wed Aug 10 18:35:23 2016 +0300

----------------------------------------------------------------------
 .../alerts/add_definition_to_group_popup.hbs    | 207 ++++++++++---------
 1 file changed, 105 insertions(+), 102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7c19dbcd/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs b/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs
index 0a3fe8a..606b4f4 100644
--- a/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs
+++ b/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs
@@ -16,79 +16,81 @@
 * limitations under the License.
 }}
 
-
-<form class="form-horizontal mbm" autocomplete="off">
-  <div class="override-controls">
-    <div class="alert alert-info">{{view.parentView.dialogMessage}}</div>
-  {{#if view.parentView.warningMessage}}
-    <div class="text-warning">
-      {{view.parentView.warningMessage}}
-    </div>
-  {{/if}}
-    <table style="width: 100%;">
-      <tr>
-        <td>
+{{#if view.parentView.isLoaded}}
+  <form class="form-horizontal mbm" autocomplete="off">
+    <div class="override-controls">
+      <div class="alert alert-info">{{view.parentView.dialogMessage}}</div>
+      {{#if view.parentView.warningMessage}}
+        <div class="text-warning">
+          {{view.parentView.warningMessage}}
+        </div>
+      {{/if}}
+      <table style="width: 100%;">
+        <tr>
+          <td>
             <a href="#" {{action toggleShowSelectedDefs target="view" }}>{{view.defSelectMessage}}</a>
-          {{#if view.showOnlySelectedDefs}}
-             <i class='icon-ok-sign'></i>
-          {{/if}}
-        </td>
-        <td width="20%">
-          <div class="row">
-            <div class="span2" id="filter-dropdown-div">
-              <!-- services drop-down -->
-              <div class="btn-group">
-                <button class="btn dropdown-toggle" data-toggle="dropdown" href="#" {{bindAttr
disabled="view.isDisabled"}}>
-                  {{t common.service}}
+            {{#if view.showOnlySelectedDefs}}
+              <i class='icon-ok-sign'></i>
+            {{/if}}
+          </td>
+          <td width="20%">
+            <div class="row">
+              <div class="span2" id="filter-dropdown-div">
+                <!-- services drop-down -->
+                <div class="btn-group">
+                  <button class="btn dropdown-toggle" data-toggle="dropdown"
+                          href="#" {{bindAttr disabled="view.isDisabled"}}>
+                    {{t common.service}}
                     <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu alert-definition-filter-list">
+                  </button>
+                  <ul class="dropdown-menu alert-definition-filter-list">
                     <!-- dropdown menu links -->
-                  {{#each service in view.filterServices}}
-                    <li>
-                      <a href="#" {{action selectFilterService service target="view"}}>
-                        {{#if service.selected}}
+                    {{#each service in view.filterServices}}
+                      <li>
+                        <a href="#" {{action selectFilterService service target="view"}}>
+                          {{#if service.selected}}
                             <i class='icon-ok-sign'></i>
-                        {{else}}
+                          {{else}}
                             <i class='icon-placeholder'></i>
-                        {{/if}}
-                        {{service.displayName}}
-                      </a>
-                    </li>
-                  {{/each}}
-                </ul>
+                          {{/if}}
+                          {{service.displayName}}
+                        </a>
+                      </li>
+                    {{/each}}
+                  </ul>
+                </div>
               </div>
-            </div>
-            <div class="span2" id="component-dropdown-div">
-              <!-- definition-components drop-down -->
-              <div class="btn-group">
-                <button class="btn dropdown-toggle" data-toggle="dropdown" href="#" {{bindAttr
disabled="view.isDisabled"}}>
-                  {{t common.component}}
+              <div class="span2" id="component-dropdown-div">
+                <!-- definition-components drop-down -->
+                <div class="btn-group">
+                  <button class="btn dropdown-toggle" data-toggle="dropdown"
+                          href="#" {{bindAttr disabled="view.isDisabled"}}>
+                    {{t common.component}}
                     <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu alert-definition-filter-list">
+                  </button>
+                  <ul class="dropdown-menu alert-definition-filter-list">
                     <!-- dropdown menu links -->
-                  {{#each component in view.filterComponents}}
-                    <li>
-                      <a href="#" {{action selectFilterComponent component target="view"}}>
-                        {{#if component.selected}}
+                    {{#each component in view.filterComponents}}
+                      <li>
+                        <a href="#" {{action selectFilterComponent component target="view"}}>
+                          {{#if component.selected}}
                             <i class='icon-ok-sign'></i>
-                        {{else}}
+                          {{else}}
                             <i class='icon-placeholder'></i>
-                        {{/if}}
-                        {{component.displayName}}
-                      </a>
-                    </li>
-                  {{/each}}
-                </ul>
+                          {{/if}}
+                          {{component.displayName}}
+                        </a>
+                      </li>
+                    {{/each}}
+                  </ul>
+                </div>
               </div>
             </div>
-          </div>
-        </td>
-      </tr>
-    </table>
-    <table class="table table-striped hosts-table">
-      <thead>
+          </td>
+        </tr>
+      </table>
+      <table class="table table-striped hosts-table">
+        <thead>
         <tr class="success">
           <th width="10%">
             {{view Ember.Checkbox checkedBinding="view.allDefsSelected" disabledBinding="view.isDisabled"}}
@@ -97,50 +99,51 @@
           <th width="25%">{{t common.service}}</th>
           <th width="30%">{{t common.component}}</th>
         </tr>
-      </thead>
-    </table>
-    <div class="hosts-table-container">
-      <table class="table table-striped hosts-table">
-        {{#if view.pageContent}}
-          {{#each entry in view.pageContent}}
-            <tr {{bindAttr class="entry.filtered::hidden"}}>
-              <td width="10%">
-                {{view Ember.Checkbox checkedBinding="entry.selected"}}
-              </td>
-              <td width="35%">
-                {{entry.label}}
-              </td>
-              <td>
-                {{entry.serviceNameDisplay}}
-              </td>
-              <td>
-                {{entry.componentNameDisplay}}
-              </td>
-            </tr>
-          {{/each}}
-        {{else}}
-          <tr>
-            <td width="30%"></td>
-            <td>{{t alerts.actions.manage_alert_groups_popup.addDefinition.noDefinitions}}</td>
-          </tr>
-        {{/if}}
+        </thead>
       </table>
+      <div class="hosts-table-container">
+        <table class="table table-striped hosts-table">
+          {{#if view.pageContent}}
+            {{#each entry in view.pageContent}}
+              <tr {{bindAttr class="entry.filtered::hidden"}}>
+                <td width="10%">
+                  {{view Ember.Checkbox checkedBinding="entry.selected"}}
+                </td>
+                <td width="35%">
+                  {{entry.label}}
+                </td>
+                <td>
+                  {{entry.serviceNameDisplay}}
+                </td>
+                <td>
+                  {{entry.componentNameDisplay}}
+                </td>
+              </tr>
+            {{/each}}
+          {{else}}
+            <tr>
+              <td width="30%"></td>
+              <td>{{t alerts.actions.manage_alert_groups_popup.addDefinition.noDefinitions}}</td>
+            </tr>
+          {{/if}}
+        </table>
+      </div>
     </div>
-</div>
-</form>
+  </form>
 
-{{#if view.isPaginate}}
-  <div class="page-bar pull-right no-borders">
-    <div class="items-on-page">
+  {{#if view.isPaginate}}
+    <div class="page-bar pull-right no-borders">
+      <div class="items-on-page">
         <label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label>
+      </div>
+      <div class="info">{{view.paginationInfo}}</div>
+      <div class="paging_two_button">
+        {{view view.paginationFirst}}
+        {{view view.paginationLeft}}
+        {{view view.paginationRight}}
+        {{view view.paginationLast}}
+      </div>
     </div>
-    <div class="info">{{view.paginationInfo}}</div>
-    <div class="paging_two_button">
-      {{view view.paginationFirst}}
-      {{view view.paginationLeft}}
-      {{view view.paginationRight}}
-      {{view view.paginationLast}}
-    </div>
-  </div>
-{{/if}}
+  {{/if}}
 
+{{/if}}
\ No newline at end of file


Mime
View raw message