Skip to content

Commit 228cffd

Browse files
committed
corrected admin menu
1 parent 7905b51 commit 228cffd

File tree

3 files changed

+44
-66343
lines changed

3 files changed

+44
-66343
lines changed

src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export default class NavMenuComponent extends Vue {
9999

100100
if (paramCount === 1 && currentRoute.params.hasOwnProperty('applicationId')) {
101101
if (applicationId == null) {
102-
this.$router.push({ name: currentRoute.name });
102+
this.$router.push({ name: currentRoute.name });
103103
PubSubService.Instance.publish(MenuApi.MessagingTopics.ApplicationChanged, { applicationId: null });
104104
} else {
105105
this.$router.push({ name: currentRoute.name, params: { applicationId: applicationId.toString() } });
@@ -112,9 +112,14 @@ export default class NavMenuComponent extends Vue {
112112
this.$router.push({ name: 'discover', params: { applicationId: applicationId.toString() } });
113113
} else if (currentRoute.path.indexOf('/analyze') === 0) {
114114
this.$router.push({ name: 'analyzeHome', params: { applicationId: applicationId.toString() } });
115-
} else if (currentRoute.path.indexOf('/manage/') !== -1 && currentRoute.path.indexOf('/manage/application') === -1) {
116-
const route = { name: 'manageAppSettings', params: { applicationId: applicationId.toString() } };
117-
this.$router.push(route);
115+
} else if (currentRoute.path.indexOf('/manage/') !== -1) {
116+
if (applicationId) {
117+
const route = { name: 'manageAppSettings', params: { applicationId: applicationId.toString() } };
118+
this.$router.push(route);
119+
} else {
120+
const route = { name: 'manageHome' };
121+
this.$router.push(route);
122+
}
118123
} else {
119124
const route = { name: currentRoute.name, params: { applicationId: applicationId.toString() } };
120125
this.$router.push(route);

src/Server/Coderr.Server.Web/Coderr.Server.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
77
<IsPackable>false</IsPackable>
88
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
9-
<Version>2.0.0-beta08</Version>
9+
<Version>2.0.0-rc02</Version>
1010
</PropertyGroup>
1111

1212
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">

0 commit comments

Comments
 (0)