Updated Branches: refs/heads/trunk a5f113af4 -> 2743782f4
AMBARI-3968. Installer - Removal of parent config-group custom-config possible. (akovalenko via Denys Buzhor) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2743782f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2743782f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2743782f Branch: refs/heads/trunk Commit: 2743782f45941f58dc266a5587565422ea78c80d Parents: a5f113a Author: Aleksandr Kovalenko <[email protected]> Authored: Wed Dec 4 17:22:15 2013 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Wed Dec 4 17:22:15 2013 +0200 ---------------------------------------------------------------------- .../app/templates/common/configs/overriddenProperty.hbs | 7 ++++--- ambari-web/app/templates/common/configs/service_config.hbs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2743782f/ambari-web/app/templates/common/configs/overriddenProperty.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs b/ambari-web/app/templates/common/configs/overriddenProperty.hbs index 4822629..053015b 100644 --- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs +++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs @@ -15,13 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. }} - {{#each overriddenSCP in view.serviceConfigProperty.overrides}} {{! Here serviceConfigBinding should ideally be serviceConfigPropertyBinding }} <div {{bindAttr class="overriddenSCP.errorMessage:error: :control-group :overrideField"}}> {{view overriddenSCP.viewClass serviceConfigBinding="overriddenSCP" categoryConfigsBinding="view.categoryConfigs"}} - {{#if overriddenSCP.group}} - <a class="action" {{action selectConfigGroup overriddenSCP.group target="controller"}}>{{overriddenSCP.group.displayName}}</a> + {{#if view.isDefaultGroupSelected}} + {{#if overriddenSCP.group}} + <a class="action" {{action selectConfigGroup overriddenSCP.group target="controller"}}>{{overriddenSCP.group.displayName}}</a> + {{/if}} {{/if}} {{#if overriddenSCP.isEditable}} {{#if isNotDefaultValue}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2743782f/ambari-web/app/templates/common/configs/service_config.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs index 5c4f174..b7c093e 100644 --- a/ambari-web/app/templates/common/configs/service_config.hbs +++ b/ambari-web/app/templates/common/configs/service_config.hbs @@ -135,7 +135,7 @@ <span class="help-inline">{{warnMessage}}</span> </div> {{#if this.isOverridden}} - {{view App.ServiceConfigView.SCPOverriddenRowsView serviceConfigPropertyBinding="this"}} + {{view App.ServiceConfigView.SCPOverriddenRowsView serviceConfigPropertyBinding="this" isDefaultGroupSelectedBinding="controller.selectedConfigGroup.isDefault"}} {{/if}} </div> </div>
