fix: Set current organization. (adempiere#989)

* fix: Set current organization. * update git sub-modules
EdwinBetanc0urt · May 2, 2023 · af86078 · af86078
1 parent fe31149
commit af86078
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
@@ -337,7 +337,7 @@ const actions = {
               })
             }
             if (isEmptyValue(role)) {
-              role = rolesList[0]
+              role = rolesList.at(0)
             }
 
             if (!isEmptyValue(role)) {
@@ -369,7 +369,10 @@ const actions = {
 
     return requestOrganizationsList({ roleUuid })
       .then(response => {
-        const organization = response.organizationsList.find(a => a.id === getters.getCurrentOrgId)
+        let organization = response.organizationsList.find(a => a.id === getters.getCurrentOrgId)
+        if (isEmptyValue(organization)) {
+          organization = response.organizationsList.at(0)
+        }
         commit('SET_ORGANIZATIONS_LIST', response.organizationsList)
         const { uuid, id } = organization
         setCurrentOrganization(uuid)

diff --git a/src/themes/default b/src/themes/default
+11 −2		components/ADempiere/Dashboard/charts/BarChart.vue
+254 −0		components/ADempiere/Dashboard/charts/CustomerChart.vue
+5 −2		components/ADempiere/Dashboard/index.vue