Skip to content

Commit

Permalink
fixed fabric plugin so it works properly against the new Fuse 6.1 cla…
Browse files Browse the repository at this point in the history
…ss names for create container DTOs
  • Loading branch information
jstrachan committed Jul 18, 2013
1 parent 5a024f1 commit ee54ccc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Expand Up @@ -5,7 +5,7 @@
<a class='btn' ng-href="#/fabric/view"><i class='icon-remove'></i> Cancel</a>
</div>
<div class="pull-right" ng-switch="activeTab">
<button ng-switch-when='org_fusesource_fabric_api_CreateContainerChildOptions' class='btn pull-right' ng-href="" hawtio-submit='create-child-container'><i class="icon-ok"></i> Create Child Container</button>
<button ng-switch-when='org_fusesource_fabric_api_CreateChildContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create-child-container'><i class="icon-ok"></i> Create Child Container</button>
<button ng-switch-when='org_fusesource_fabric_api_CreateSshContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create-ssh-container'><i class="icon-ok"></i> Create SSH Container</button>
<button ng-switch-when='org_fusesource_fabric_api_CreateJCloudsContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create-cloud-container'><i class="icon-ok"></i> Create JCloud Container</button>
</div>
Expand All @@ -15,7 +15,7 @@
<div class="span5">
<p>1. Select the container creation method and fill in the relevant details</p>
<div class="tabbable hawtio-form-tabs" ng-model=activeTab>
<div class="tab-pane" title="Child Container" value='org_fusesource_fabric_api_CreateContainerChildOptions'>
<div class="tab-pane" title="Child Container" value='org_fusesource_fabric_api_CreateChildContainerOptions'>
<div simple-form name='create-child-container' data='schema' entity='entity'></div>

</div>
Expand Down
8 changes: 4 additions & 4 deletions hawtio-web/src/main/webapp/app/fabric/js/createContainer.ts
Expand Up @@ -5,7 +5,7 @@ module Fabric {

$scope.versionsOp = 'versions()';

$scope.activeTab = 'org_fusesource_fabric_api_CreateContainerChildOptions';
$scope.activeTab = 'org_fusesource_fabric_api_CreateChildContainerOptions';

$scope.schema = {};
$scope.entity = {};
Expand All @@ -29,7 +29,7 @@ module Fabric {
if (tab) {
switch(tab) {
case 'child':
$scope.activeTab = 'org_fusesource_fabric_api_CreateContainerChildOptions';
$scope.activeTab = 'org_fusesource_fabric_api_CreateChildContainerOptions';
break;
case 'ssh':
$scope.activeTab = 'org_fusesource_fabric_api_CreateSshContainerOptions';
Expand All @@ -38,7 +38,7 @@ module Fabric {
$scope.activeTab = 'org_fusesource_fabric_api_CreateJCloudsContainerOptions';
break;
default:
$scope.activeTab = 'org_fusesource_fabric_api_CreateContainerChildOptions';
$scope.activeTab = 'org_fusesource_fabric_api_CreateChildContainerOptions';
}
}

Expand Down Expand Up @@ -120,7 +120,7 @@ module Fabric {

switch($scope.activeTab) {

case 'org_fusesource_fabric_api_CreateContainerChildOptions':
case 'org_fusesource_fabric_api_CreateChildContainerOptions':
$scope.entity['providerType'] = 'child';
$scope.entity['jmxUser'] = localStorage['fabric.userName'];
$scope.entity['jmxPassword'] = localStorage['fabric.password'];
Expand Down

0 comments on commit ee54ccc

Please sign in to comment.