Skip to content

Commit

Permalink
Fix breakage with profile selector on container detail page
Browse files Browse the repository at this point in the history
  • Loading branch information
gashcrumb committed Oct 3, 2013
1 parent c8c4656 commit 35ade51
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions hawtio-web/src/main/webapp/app/fabric/html/container.html
Expand Up @@ -226,7 +226,6 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
</dl>
</div>


<div class="tab-pane" title="Provision List">
<dl>
<dt class="provision-list-title">
Expand Down Expand Up @@ -258,6 +257,7 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
</div>
</div>


<div hawtio-confirm-dialog="connectToContainerDialog.show" title="Connect to {{targetContainer.id}}?" ok-button-text="Connect" on-ok="connect()">
<div class="dialog-body">
<p>Please enter the JMX user name and password for {{targetContainer.id}}:</p>
Expand Down Expand Up @@ -305,7 +305,7 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
<div id="dialog-body" class="modal-body">
<label>Select one or more profiles to add to this container: </label>

<div fabric-profile-selector="$parent.selectedProfilesDialog" version-id="row.versionId" excluded-profiles="row.profileIds"></div>
<div fabric-profile-selector="selectedProfilesDialog" version-id="row.versionId" excluded-profiles="row.profileIds"></div>

</div>
<div class="modal-footer">
Expand All @@ -318,3 +318,4 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>

</div>


Expand Up @@ -100,7 +100,7 @@ module Fabric {

$scope.included = () => {
return $scope.profiles.exclude((p) => { return $scope.includedProfiles.none((e) => { return e === p.id; })});
}
};


$scope.isOpen = (branch) => {
Expand All @@ -124,13 +124,13 @@ module Fabric {

$scope.$watch('includedProfiles', (newValue, oldValue) => {
if (newValue !== oldValue) {
$scope.profiles = $scope.included();
$scope.init();
}
}, true);

$scope.$watch('excludedProfiles', (newValue, oldValue) => {
if (newValue !== oldValue) {
$scope.profiles = $scope.excluded();
$scope.init();
}
}, true);

Expand Down

0 comments on commit 35ade51

Please sign in to comment.