Merge pull request #3871 from jumpserver/dev

v3.10.9 (dev to master)

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"
   }
-}
+}

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)
   })
 }

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 = {

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')