You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/05/19 14:01:11 UTC
[1/2] ambari git commit: AMBARI-16712. Add id to combo widget.
Additional patch (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 4408d779b -> 9d5f1b400
AMBARI-16712. Add id to combo widget. Additional patch (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9d5f1b40
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9d5f1b40
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9d5f1b40
Branch: refs/heads/trunk
Commit: 9d5f1b4005278d237f094a8a32258d20a046dd75
Parents: 234b9cd
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu May 19 16:59:58 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu May 19 17:01:06 2016 +0300
----------------------------------------------------------------------
.../app/templates/common/configs/widgets/combo_config_widget.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d5f1b40/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
index a42486f..a338315 100644
--- a/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
@@ -26,7 +26,7 @@
<ul {{bindAttr class=":pull-left :dropdown-menu"}}>
{{#each item in view.content.valuesList}}
<li>
- <a href="#" {{bindAttr class="item.widgetValue :btn-dropdown-menu-combo-config"}} {{action setConfigValue item.configValue target="view"}}>{{item.widgetValue}}</a>
+ <a href="#" {{bindAttr class="item.configValue :btn-dropdown-menu-combo-config"}} {{action setConfigValue item.configValue target="view"}}>{{item.widgetValue}}</a>
</li>
{{/each}}
</ul>
[2/2] ambari git commit: AMBARI-16767. Persist UI console errors
(alexantonenko)
Posted by al...@apache.org.
AMBARI-16767. Persist UI console errors (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/234b9cda
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/234b9cda
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/234b9cda
Branch: refs/heads/trunk
Commit: 234b9cdadadf9096ff49965b9c81b1abc3d5a751
Parents: 4408d77
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu May 19 16:50:27 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu May 19 17:01:06 2016 +0300
----------------------------------------------------------------------
ambari-web/app/controllers.js | 1 +
.../global/errors_handler_controller.js | 45 ++++++++++++++++++++
2 files changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/234b9cda/ambari-web/app/controllers.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js
index 6235112..2537f62 100644
--- a/ambari-web/app/controllers.js
+++ b/ambari-web/app/controllers.js
@@ -27,6 +27,7 @@ require('controllers/experimental');
require('controllers/global/background_operations_controller');
require('controllers/global/wizard_watcher_controller');
require('controllers/global/user_settings_controller');
+require('controllers/global/errors_handler_controller');
require('controllers/main');
require('controllers/main/dashboard');
require('controllers/main/dashboard/config_history_controller');
http://git-wip-us.apache.org/repos/asf/ambari/blob/234b9cda/ambari-web/app/controllers/global/errors_handler_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/errors_handler_controller.js b/ambari-web/app/controllers/global/errors_handler_controller.js
new file mode 100644
index 0000000..52feea3
--- /dev/null
+++ b/ambari-web/app/controllers/global/errors_handler_controller.js
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF 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.
+ */
+
+var App = require('app');
+
+App.ErrorsHandlerController = Em.Controller.extend(App.UserPref, {
+ init: function () {
+ var oldError = window.onerror || Em.K;
+ var self = this;
+ window.onerror = function (err, url, lineNumber, colNumber, Err) {
+ oldError.call(this, err, url, lineNumber, colNumber, Err);
+ var ls = localStorage.getObject('errors') || {};
+ if(Object.keys(localStorage.getObject('errors')).length > 25) {
+ delete ls[Object.keys(ls).sort()[0]];
+ }
+ var key = new Date().getTime();
+ var val = {
+ file: url,
+ line: lineNumber,
+ col: colNumber,
+ error: err,
+ stackTrace: Em.get(Err || {}, 'stack')
+ };
+ ls[key] = val;
+ localStorage.setObject('errors', ls);
+ self.postUserPref(key, val);
+ };
+ return this._super();
+ }
+});