You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2015/06/12 19:45:47 UTC
ambari git commit: AMBARI-11869. Widget creation long description is
giving 500 error.(XIWANG)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 1659d2af4 -> 9e34a010f
AMBARI-11869. Widget creation long description is giving 500 error.(XIWANG)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9e34a010
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9e34a010
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9e34a010
Branch: refs/heads/branch-2.1
Commit: 9e34a010f5260c67c5b43346533941bce4d09efd
Parents: 1659d2a
Author: Xi Wang <xi...@apache.org>
Authored: Thu Jun 11 15:34:55 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Jun 12 10:39:22 2015 -0700
----------------------------------------------------------------------
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +-
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +-
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 2 +-
.../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +-
.../service/widgets/create/step3_controller.js | 17 ++++++++++++++++-
ambari-web/app/messages.js | 2 ++
.../app/styles/enhanced_service_dashboard.less | 9 +++++++++
.../main/service/widgets/create/step3.hbs | 15 +++++++++++++--
9 files changed, 45 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34a010/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 4f0b1f0..700f9bf 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -549,7 +549,7 @@ CREATE TABLE widget (
metrics LONGTEXT,
time_created BIGINT NOT NULL,
author VARCHAR(255),
- description VARCHAR(255),
+ description VARCHAR(2048),
default_section_name VARCHAR(255),
scope VARCHAR(255),
widget_values LONGTEXT,
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34a010/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index b6125ba..209e8f8 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -538,7 +538,7 @@ CREATE TABLE widget (
metrics CLOB,
time_created NUMBER(19) NOT NULL,
author VARCHAR2(255),
- description VARCHAR2(255),
+ description VARCHAR2(2048),
default_section_name VARCHAR2(255),
scope VARCHAR2(255),
widget_values CLOB,
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34a010/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
index 69705d3..fa11804 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -547,7 +547,7 @@ CREATE TABLE widget (
metrics TEXT,
time_created BIGINT NOT NULL,
author VARCHAR(255),
- description VARCHAR(255),
+ description VARCHAR(2048),
default_section_name VARCHAR(255),
scope VARCHAR(255),
widget_values TEXT,
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34a010/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
index 374d08f..ae4eef0 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
@@ -623,7 +623,7 @@ CREATE TABLE ambari.widget (
metrics TEXT,
time_created BIGINT NOT NULL,
author VARCHAR(255),
- description VARCHAR(255),
+ description VARCHAR(2048),
default_section_name VARCHAR(255),
scope VARCHAR(255),
widget_values TEXT,
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34a010/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
index 37186b6..6ede40f 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -659,7 +659,7 @@ CREATE TABLE widget (
metrics TEXT,
time_created BIGINT NOT NULL,
author VARCHAR(255),
- description VARCHAR(255),
+ description VARCHAR(2048),
default_section_name VARCHAR(255),
scope VARCHAR(255),
widget_values VARCHAR(4000),
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34a010/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js b/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js
index 7eff3be..c584604 100644
--- a/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js
+++ b/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js
@@ -77,10 +77,25 @@ App.WidgetWizardStep3Controller = Em.Controller.extend({
* @type {boolean}
*/
isSubmitDisabled: function () {
- return this.get('widgetName') ? !Boolean(this.get('widgetName').trim()) : true;
+ var widgetNameEmpty = this.get('widgetName') ? !Boolean(this.get('widgetName').trim()) : true;
+ return widgetNameEmpty || this.get('isNameInvalid') || this.get('isDescriptionInvalid');
+ }.property('widgetName', 'isNameInvalid', 'isDescriptionInvalid'),
+
+ /**
+ * @type {boolean}
+ */
+ isNameInvalid: function () {
+ return this.get('widgetName') ? this.get('widgetName').length >= 129 : false;
}.property('widgetName'),
/**
+ * @type {boolean}
+ */
+ isDescriptionInvalid: function () {
+ return this.get('widgetDescription') ? this.get('widgetDescription').length >= 2049 : false;
+ }.property('widgetDescription'),
+
+ /**
* restore widget data set on 2nd step
*/
initPreviewData: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34a010/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index bbf690b..665ce8b 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2592,6 +2592,8 @@ Em.I18n.translations = {
'widget.create.wizard.step3.sharing': 'Sharing',
'widget.create.wizard.step3.sharing.msg': 'Share this widget in the widget library',
'widget.create.wizard.step3.header': 'Name and Description',
+ 'widget.create.wizard.step3.name.invalid.msg': 'Widget name is too long. Please enter a widget name less than 129 characters.',
+ 'widget.create.wizard.step3.description.invalid.msg': 'Description is too long. Please enter a description less than 2049 characters.',
'widget.edit.wizard.header': 'Edit Widget',
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34a010/ambari-web/app/styles/enhanced_service_dashboard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less b/ambari-web/app/styles/enhanced_service_dashboard.less
index e55f9c7..c91686f 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -496,6 +496,15 @@
width: 320px;
height: 75px;
}
+ .span10.error {
+ .ember-text-field,
+ .ember-text-area{
+ border: 1px solid #b94a48;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ }
+ }
}
}
#add-widget-step3-save {
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34a010/ambari-web/app/templates/main/service/widgets/create/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/widgets/create/step3.hbs b/ambari-web/app/templates/main/service/widgets/create/step3.hbs
index 45bdee6..9f431af 100644
--- a/ambari-web/app/templates/main/service/widgets/create/step3.hbs
+++ b/ambari-web/app/templates/main/service/widgets/create/step3.hbs
@@ -22,7 +22,12 @@
<form>
<div class="row-fluid">
<div class="span2 title">{{t widget.create.wizard.step3.widgetName}}<i class="icon-asterisk"></i></div>
- <div class="span10">{{view Ember.TextField valueBinding="widgetName"}}</div>
+ <div {{bindAttr class=":span10 isNameInvalid:error"}}>
+ {{view Ember.TextField valueBinding="widgetName"}}
+ {{#if isNameInvalid}}
+ <div>{{t widget.create.wizard.step3.name.invalid.msg}}</div>
+ {{/if}}
+ </div>
</div>
<div class="row-fluid">
@@ -42,8 +47,14 @@
<div class="row-fluid">
<div class="span2 title">{{t common.description}}</div>
- <div class="span10">{{view Ember.TextArea valueBinding="widgetDescription" class="description-text-area"}}</div>
+ <div {{bindAttr class=":span10 isDescriptionInvalid:error"}}>
+ {{view Ember.TextArea valueBinding="widgetDescription" class="description-text-area"}}
+ {{#if isDescriptionInvalid}}
+ <div>{{t widget.create.wizard.step3.description.invalid.msg}}</div>
+ {{/if}}
+ </div>
</div>
+
</form>
<div class="btn-area">