[02/50] [abbrv] ambari git commit: AMBARI-19030 Service Auto Start operations are permitted during Upgrade (atkach)

[ncole]

AMBARI-19030 Service Auto Start operations are permitted during Upgrade (atkach)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 89780fabad715e971accb66c3c634cfe0030a91f
Parents: d369809
Author: Andrii Tkach 
Authored: Wed Nov 30 14:33:08 2016 +0200
Committer: Andrii Tkach 
Committed: Wed Nov 30 14:33:08 2016 +0200

--
 .../templates/main/admin/service_auto_start.hbs | 24 +++-
 ambari-web/app/views/main/admin.js  |  3 ++-
 .../app/views/main/admin/service_auto_start.js  |  5 
 .../service_auto_start/component_auto_start.js  |  1 +
 4 files changed, 21 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/templates/main/admin/service_auto_start.hbs
--
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs 
b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index 7334995..c5a92cf 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -80,17 +80,19 @@
 
   {{/each}}
 
-
-  
-
-
-  
-{{t common.enableAll}}
-   |
-  {{t common.disableAll}}
-
-  
-
+{{#isAuthorized "SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS"}}
+  
+
+  
+  
+
+{{t common.enableAll}}
+ |
+{{t common.disableAll}}
+  
+
+  
+{{/isAuthorized}}
   
 
   {{/each}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/views/main/admin.js
--
diff --git a/ambari-web/app/views/main/admin.js 
b/ambari-web/app/views/main/admin.js
index 704527b..0fa84e8 100644
--- a/ambari-web/app/views/main/admin.js
+++ b/ambari-web/app/views/main/admin.js
@@ -51,7 +51,8 @@ App.MainAdminView = Em.View.extend({
 items.push({
   name: 'serviceAutoStart',
   url: 'adminServiceAutoStart',
-  label: Em.I18n.t('admin.serviceAutoStart.title')
+  label: Em.I18n.t('admin.serviceAutoStart.title'),
+  disabled: App.get('upgradeInProgress') || App.get('upgradeHolding')
 });
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/views/main/admin/service_auto_start.js
--
diff --git a/ambari-web/app/views/main/admin/service_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start.js
index 7b4e46c..1af9845 100644
--- a/ambari-web/app/views/main/admin/service_auto_start.js
+++ b/ambari-web/app/views/main/admin/service_auto_start.js
@@ -27,8 +27,12 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
*/
   isLoaded: false,
 
+  isDisabled: false,
+
   didInsertElement: function () {
 var self = this;
+
+this.set('isDisabled', !App.isAuthorized('SERVICE.START_STOP, 
CLUSTER.MODIFY_CONFIGS'));
 this.get('controller').load().then(function() {
   self.set('isLoaded', true);
   self.initSwitcher();
@@ -55,6 +59,7 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
 offText: Em.I18n.t('common.disabled'),
 offColor: 'default',
 onColor: 'success',
+disabled: this.get('isDisabled'),
 handleWidth: Math.max(Em.I18n.t('common.enabled').length, 
Em.I18n.t('common.disabled').length) * 8,
 onSwitchChange: function (event, state) {
   self.set('controller.servicesAutoStart', state);

http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
--
diff --git 
a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
index 8588b04..a1e09f2 100644
--- a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
+++ 

[06/32] ambari git commit: AMBARI-19030 Service Auto Start operations are permitted during Upgrade (atkach)

[jonathanhurley]

AMBARI-19030 Service Auto Start operations are permitted during Upgrade (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 89780fabad715e971accb66c3c634cfe0030a91f
Parents: d369809
Author: Andrii Tkach 
Authored: Wed Nov 30 14:33:08 2016 +0200
Committer: Andrii Tkach 
Committed: Wed Nov 30 14:33:08 2016 +0200

--
 .../templates/main/admin/service_auto_start.hbs | 24 +++-
 ambari-web/app/views/main/admin.js  |  3 ++-
 .../app/views/main/admin/service_auto_start.js  |  5 
 .../service_auto_start/component_auto_start.js  |  1 +
 4 files changed, 21 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/templates/main/admin/service_auto_start.hbs
--
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs 
b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index 7334995..c5a92cf 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -80,17 +80,19 @@
 
   {{/each}}
 
-
-  
-
-
-  
-{{t common.enableAll}}
-   |
-  {{t common.disableAll}}
-
-  
-
+{{#isAuthorized "SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS"}}
+  
+
+  
+  
+
+{{t common.enableAll}}
+ |
+{{t common.disableAll}}
+  
+
+  
+{{/isAuthorized}}
   
 
   {{/each}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/views/main/admin.js
--
diff --git a/ambari-web/app/views/main/admin.js 
b/ambari-web/app/views/main/admin.js
index 704527b..0fa84e8 100644
--- a/ambari-web/app/views/main/admin.js
+++ b/ambari-web/app/views/main/admin.js
@@ -51,7 +51,8 @@ App.MainAdminView = Em.View.extend({
 items.push({
   name: 'serviceAutoStart',
   url: 'adminServiceAutoStart',
-  label: Em.I18n.t('admin.serviceAutoStart.title')
+  label: Em.I18n.t('admin.serviceAutoStart.title'),
+  disabled: App.get('upgradeInProgress') || App.get('upgradeHolding')
 });
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/views/main/admin/service_auto_start.js
--
diff --git a/ambari-web/app/views/main/admin/service_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start.js
index 7b4e46c..1af9845 100644
--- a/ambari-web/app/views/main/admin/service_auto_start.js
+++ b/ambari-web/app/views/main/admin/service_auto_start.js
@@ -27,8 +27,12 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
*/
   isLoaded: false,
 
+  isDisabled: false,
+
   didInsertElement: function () {
 var self = this;
+
+this.set('isDisabled', !App.isAuthorized('SERVICE.START_STOP, 
CLUSTER.MODIFY_CONFIGS'));
 this.get('controller').load().then(function() {
   self.set('isLoaded', true);
   self.initSwitcher();
@@ -55,6 +59,7 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
 offText: Em.I18n.t('common.disabled'),
 offColor: 'default',
 onColor: 'success',
+disabled: this.get('isDisabled'),
 handleWidth: Math.max(Em.I18n.t('common.enabled').length, 
Em.I18n.t('common.disabled').length) * 8,
 onSwitchChange: function (event, state) {
   self.set('controller.servicesAutoStart', state);

http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
--
diff --git 
a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
index 8588b04..a1e09f2 100644
--- a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
+++ 

[35/50] ambari git commit: AMBARI-19030 Service Auto Start operations are permitted during Upgrade. (atkach)

[swapan]

AMBARI-19030 Service Auto Start operations are permitted during Upgrade. 
(atkach)


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

Branch: refs/heads/branch-feature-AMBARI-18901
Commit: 1bd562a1803efa12a4afcbf312c5a898f63bff41
Parents: adde3db
Author: Andrii Tkach 
Authored: Wed Nov 30 14:19:52 2016 +0200
Committer: Andrii Tkach 
Committed: Wed Nov 30 15:45:04 2016 +0200

--
 .../app/templates/main/admin/service_auto_start.hbs   | 10 ++
 ambari-web/app/views/main/admin.js|  3 ++-
 ambari-web/app/views/main/admin/service_auto_start.js |  4 
 .../main/admin/service_auto_start/component_auto_start.js |  1 +
 .../admin/stack_upgrade/upgrade_version_box_view_test.js  |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1bd562a1/ambari-web/app/templates/main/admin/service_auto_start.hbs
--
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs 
b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index e2eb192..a14add2 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -63,10 +63,12 @@
 
 
 {{/each}}
-
-{{t common.enableAll}} |
-{{t common.disableAll}}
-
+{{#isAuthorized "SERVICE.START_STOP, 
CLUSTER.MODIFY_CONFIGS"}}
+
+{{t common.enableAll}} |
+{{t common.disableAll}}
+
+{{/isAuthorized}}
 
 {{/each}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1bd562a1/ambari-web/app/views/main/admin.js
--
diff --git a/ambari-web/app/views/main/admin.js 
b/ambari-web/app/views/main/admin.js
index 704527b..0fa84e8 100644
--- a/ambari-web/app/views/main/admin.js
+++ b/ambari-web/app/views/main/admin.js
@@ -51,7 +51,8 @@ App.MainAdminView = Em.View.extend({
 items.push({
   name: 'serviceAutoStart',
   url: 'adminServiceAutoStart',
-  label: Em.I18n.t('admin.serviceAutoStart.title')
+  label: Em.I18n.t('admin.serviceAutoStart.title'),
+  disabled: App.get('upgradeInProgress') || App.get('upgradeHolding')
 });
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/1bd562a1/ambari-web/app/views/main/admin/service_auto_start.js
--
diff --git a/ambari-web/app/views/main/admin/service_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start.js
index 5b10d1b..51512a2 100644
--- a/ambari-web/app/views/main/admin/service_auto_start.js
+++ b/ambari-web/app/views/main/admin/service_auto_start.js
@@ -30,8 +30,11 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
 
   savedRecoveryEnabled: false,
 
+  isDisabled: false,
+
   didInsertElement: function () {
 var self = this;
+this.set('isDisabled', !App.isAuthorized('SERVICE.START_STOP, 
CLUSTER.MODIFY_CONFIGS'));
 this.get('controller').loadClusterConfig().done(function (data) {
   var tag = [
 {
@@ -77,6 +80,7 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
 offText: Em.I18n.t('common.disabled'),
 offColor: 'default',
 onColor: 'success',
+disabled: this.get('isDisabled'),
 handleWidth: Math.max(Em.I18n.t('common.enabled').length, 
Em.I18n.t('common.disabled').length) * 8,
 onSwitchChange: function (event, state) {
   self.updateClusterConfigs(state);

http://git-wip-us.apache.org/repos/asf/ambari/blob/1bd562a1/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
--
diff --git 
a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
index ceafd21..9794d6f 100644
--- a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
+++ b/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
@@ -56,6 +56,7 @@ App.MainAdminServiceAutoStartComponentView = Em.View.extend({
 offText: 

ambari git commit: AMBARI-19030 Service Auto Start operations are permitted during Upgrade. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 adde3db03 -> 1bd562a18


AMBARI-19030 Service Auto Start operations are permitted during Upgrade. 
(atkach)


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

Branch: refs/heads/branch-2.5
Commit: 1bd562a1803efa12a4afcbf312c5a898f63bff41
Parents: adde3db
Author: Andrii Tkach 
Authored: Wed Nov 30 14:19:52 2016 +0200
Committer: Andrii Tkach 
Committed: Wed Nov 30 15:45:04 2016 +0200

--
 .../app/templates/main/admin/service_auto_start.hbs   | 10 ++
 ambari-web/app/views/main/admin.js|  3 ++-
 ambari-web/app/views/main/admin/service_auto_start.js |  4 
 .../main/admin/service_auto_start/component_auto_start.js |  1 +
 .../admin/stack_upgrade/upgrade_version_box_view_test.js  |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1bd562a1/ambari-web/app/templates/main/admin/service_auto_start.hbs
--
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs 
b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index e2eb192..a14add2 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -63,10 +63,12 @@
 
 
 {{/each}}
-
-{{t common.enableAll}} |
-{{t common.disableAll}}
-
+{{#isAuthorized "SERVICE.START_STOP, 
CLUSTER.MODIFY_CONFIGS"}}
+
+{{t common.enableAll}} |
+{{t common.disableAll}}
+
+{{/isAuthorized}}
 
 {{/each}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1bd562a1/ambari-web/app/views/main/admin.js
--
diff --git a/ambari-web/app/views/main/admin.js 
b/ambari-web/app/views/main/admin.js
index 704527b..0fa84e8 100644
--- a/ambari-web/app/views/main/admin.js
+++ b/ambari-web/app/views/main/admin.js
@@ -51,7 +51,8 @@ App.MainAdminView = Em.View.extend({
 items.push({
   name: 'serviceAutoStart',
   url: 'adminServiceAutoStart',
-  label: Em.I18n.t('admin.serviceAutoStart.title')
+  label: Em.I18n.t('admin.serviceAutoStart.title'),
+  disabled: App.get('upgradeInProgress') || App.get('upgradeHolding')
 });
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/1bd562a1/ambari-web/app/views/main/admin/service_auto_start.js
--
diff --git a/ambari-web/app/views/main/admin/service_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start.js
index 5b10d1b..51512a2 100644
--- a/ambari-web/app/views/main/admin/service_auto_start.js
+++ b/ambari-web/app/views/main/admin/service_auto_start.js
@@ -30,8 +30,11 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
 
   savedRecoveryEnabled: false,
 
+  isDisabled: false,
+
   didInsertElement: function () {
 var self = this;
+this.set('isDisabled', !App.isAuthorized('SERVICE.START_STOP, 
CLUSTER.MODIFY_CONFIGS'));
 this.get('controller').loadClusterConfig().done(function (data) {
   var tag = [
 {
@@ -77,6 +80,7 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
 offText: Em.I18n.t('common.disabled'),
 offColor: 'default',
 onColor: 'success',
+disabled: this.get('isDisabled'),
 handleWidth: Math.max(Em.I18n.t('common.enabled').length, 
Em.I18n.t('common.disabled').length) * 8,
 onSwitchChange: function (event, state) {
   self.updateClusterConfigs(state);

http://git-wip-us.apache.org/repos/asf/ambari/blob/1bd562a1/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
--
diff --git 
a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
index ceafd21..9794d6f 100644
--- a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
+++ b/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
@@ -56,6 +56,7 @@ 

ambari git commit: AMBARI-19030 Service Auto Start operations are permitted during Upgrade (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/trunk d369809c9 -> 89780faba


AMBARI-19030 Service Auto Start operations are permitted during Upgrade (atkach)


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

Branch: refs/heads/trunk
Commit: 89780fabad715e971accb66c3c634cfe0030a91f
Parents: d369809
Author: Andrii Tkach 
Authored: Wed Nov 30 14:33:08 2016 +0200
Committer: Andrii Tkach 
Committed: Wed Nov 30 14:33:08 2016 +0200

--
 .../templates/main/admin/service_auto_start.hbs | 24 +++-
 ambari-web/app/views/main/admin.js  |  3 ++-
 .../app/views/main/admin/service_auto_start.js  |  5 
 .../service_auto_start/component_auto_start.js  |  1 +
 4 files changed, 21 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/templates/main/admin/service_auto_start.hbs
--
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs 
b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index 7334995..c5a92cf 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -80,17 +80,19 @@
 
   {{/each}}
 
-
-  
-
-
-  
-{{t common.enableAll}}
-   |
-  {{t common.disableAll}}
-
-  
-
+{{#isAuthorized "SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS"}}
+  
+
+  
+  
+
+{{t common.enableAll}}
+ |
+{{t common.disableAll}}
+  
+
+  
+{{/isAuthorized}}
   
 
   {{/each}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/views/main/admin.js
--
diff --git a/ambari-web/app/views/main/admin.js 
b/ambari-web/app/views/main/admin.js
index 704527b..0fa84e8 100644
--- a/ambari-web/app/views/main/admin.js
+++ b/ambari-web/app/views/main/admin.js
@@ -51,7 +51,8 @@ App.MainAdminView = Em.View.extend({
 items.push({
   name: 'serviceAutoStart',
   url: 'adminServiceAutoStart',
-  label: Em.I18n.t('admin.serviceAutoStart.title')
+  label: Em.I18n.t('admin.serviceAutoStart.title'),
+  disabled: App.get('upgradeInProgress') || App.get('upgradeHolding')
 });
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/views/main/admin/service_auto_start.js
--
diff --git a/ambari-web/app/views/main/admin/service_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start.js
index 7b4e46c..1af9845 100644
--- a/ambari-web/app/views/main/admin/service_auto_start.js
+++ b/ambari-web/app/views/main/admin/service_auto_start.js
@@ -27,8 +27,12 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
*/
   isLoaded: false,
 
+  isDisabled: false,
+
   didInsertElement: function () {
 var self = this;
+
+this.set('isDisabled', !App.isAuthorized('SERVICE.START_STOP, 
CLUSTER.MODIFY_CONFIGS'));
 this.get('controller').load().then(function() {
   self.set('isLoaded', true);
   self.initSwitcher();
@@ -55,6 +59,7 @@ App.MainAdminServiceAutoStartView = Em.View.extend({
 offText: Em.I18n.t('common.disabled'),
 offColor: 'default',
 onColor: 'success',
+disabled: this.get('isDisabled'),
 handleWidth: Math.max(Em.I18n.t('common.enabled').length, 
Em.I18n.t('common.disabled').length) * 8,
 onSwitchChange: function (event, state) {
   self.set('controller.servicesAutoStart', state);

http://git-wip-us.apache.org/repos/asf/ambari/blob/89780fab/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
--
diff --git 
a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js 
b/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js
index 8588b04..a1e09f2 100644
--- a/ambari-web/app/views/main/admin/service_auto_start/component_auto_start.js