Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/sidebar-updates-from-dashboard'
Browse files Browse the repository at this point in the history
Close #118
  • Loading branch information
weierophinney committed Aug 11, 2016
2 parents d327a89 + ce81801 commit c34f267
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 1.3.5 - TBD
## 1.3.5 - 2016-08-11

### Added

Expand All @@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- [#118](https://github.com/zfcampus/zf-apigility-admin-ui/pull/118) fixes the
API dashboard new service modal handler to ensure that the sidebar is updated
when a new service is successfully created.

## 1.3.4 - 2016-08-10

Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<script src="apigility-ui/1bc54cd5.vendor.js" charset="utf-8"></script>

<script src="apigility-ui/2122ca26.apigility.js" charset="utf-8"></script>
<script src="apigility-ui/fe6d59d8.apigility.js" charset="utf-8"></script>

<script>
$(document).ready(function () {
Expand Down
15 changes: 13 additions & 2 deletions src/apigility-ui/api-module/api-module.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,18 @@
});

modalInstance.result.then(function (response) {
SidebarService.addRestService(response.api, response.rest);
if (response.hasOwnProperty('rest')) {
SidebarService.setSelectedVersion(response.api, response.ver);
$state.go('ag.rest', {api: response.api, ver: response.ver, rest: response.rest});
vm.setSelected('api' + response.api + 'rest' + response.rest);
} else if (response.hasOwnProperty('rpc')) {
SidebarService.setSelectedVersion(response.api, response.ver);
$state.go('ag.rpc', {api: response.api, ver: response.ver, rpc: response.rpc});
vm.setSelected('api' + response.api + 'rpc' + response.rpc);
} else if (response.hasOwnProperty('rests')) {
SidebarService.setSelectedVersion(response.api, response.ver);
$state.go('ag.apimodule', {api: response.api, ver: response.ver});
}
});
};

Expand All @@ -104,7 +115,7 @@
vm.alert = response;
return;
}
})
});
};

vm.saveAuthentication = function(auth) {
Expand Down

0 comments on commit c34f267

Please sign in to comment.