diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index a83f5df88..38415c9f0 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -994,14 +994,14 @@ "RealTimeData": "Real-time data", "UserAssetActivity": "User/asset activity status", "UserData": "User data", - "LoginUserToday": "Login account today", + "LoginUserToday": "Login accounts today", "AssetData": "Asset data", - "LoginAssetToday": "Active asset today", + "LoginAssetToday": "Active assets today", "WeekAdd": "New this week", "ProportionOfAssetTypes": "Proportion of asset types", "Proportion": "Proportion", "LoginUserRanking": "Session user ranking", - "ActiveAssetRanking": "Session asset Ranking", + "ActiveAssetRanking": "Session asset ranking", "AssetName": "Asset name", "NumberOfVisits": "Number of visits", "ranking": "Ranking", @@ -2434,4 +2434,4 @@ "BindResource": "Bind resource", "SelectResource": "Select resource" } -} \ No newline at end of file +} diff --git a/src/utils/startup.js b/src/utils/startup.js index f521ab267..15d96e24e 100644 --- a/src/utils/startup.js +++ b/src/utils/startup.js @@ -41,7 +41,7 @@ async function getPublicSetting({ to, from, next }, isOpen) { } async function refreshCurrentOrg() { - orgs.getCurrentOrg().then(org => { + return orgs.getCurrentOrg().then(org => { store.dispatch('users/setCurrentOrg', org) }) } diff --git a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue index fa0d8ecd7..212d8618b 100644 --- a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue +++ b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue @@ -131,7 +131,7 @@ export default { const { defaultConfig } = this const { node, platform } = this.$route?.query || {} const nodesInitial = node ? [node] : [] - const platformId = platform || 1 + const platformId = platform || 'Linux' const url = `/api/v1/assets/platforms/${platformId}/` this.platform = await this.$axios.get(url) const initial = { diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue index e0ceab0d2..67fc28621 100644 --- a/src/views/assets/Asset/AssetList/components/BaseList.vue +++ b/src/views/assets/Asset/AssetList/components/BaseList.vue @@ -101,7 +101,7 @@ export default { route.query.type = row.type.value route.query.category = row.type.category } - const createInNewPage = this.$route.query.node_id && routeAction === 'Create' + const createInNewPage = this.$route.query.node_id if (createInNewPage) { const { href } = vm.$router.resolve(route) window.open(href, '_blank')