fix: improve jsp to load correctly org chart portlet in layout manage…

…ment - Meed-io/meeds#112 - EXO-71745 (#3819) Remove inline variable declaration when initiating Org cart application, to avoid the issue when loading it with layout management
Meeds-io · May 21, 2024 · a8bf074 · a8bf074
1 parent 99c80a7
commit a8bf074
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/organizationalChart.jsp b/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/organizationalChart.jsp
@@ -74,21 +74,20 @@
     }
 %>
 
-<div class="VuetifyApp">
+<div class="VuetifyApp" id="organizationalChartParent">
     <div data-app="true"
          id="organizationalChart"
          class="v-application transparent v-application--is-ltr theme--light">
         <% if (propertySetting.isActive()) { %>
             <script type="text/javascript">
-                const settings = {
-                    userId: "<%=centerUser%>" !== 'null' && "<%=centerUser%>" || null,
-                    title: "<%=headerTitle%>" !== 'null' && "<%=headerTitle%>" || null,
-                    headerTranslations: <%=headerTranslations%>,
-                    canUpdateCenterUser: <%=canUpdateCenterUser%>,
-                    hasHeaderTitle: <%=hasHeaderTitle%>,
-                    isSpaceManager: <%=isManager%>
-                }
-                require(['PORTLET/social-portlet/OrganizationalChart'], app => app.init('<%=id%>', settings));
+                require(['PORTLET/social-portlet/OrganizationalChart'], app => app.init('<%=id%>', {
+                                                                                                       userId: "<%=centerUser%>" !== 'null' && "<%=centerUser%>" || null,
+                                                                                                       title: "<%=headerTitle%>" !== 'null' && "<%=headerTitle%>" || null,
+                                                                                                       headerTranslations: <%=headerTranslations%>,
+                                                                                                       canUpdateCenterUser: <%=canUpdateCenterUser%>,
+                                                                                                       hasHeaderTitle: <%=hasHeaderTitle%>,
+                                                                                                       isSpaceManager: <%=isManager%>
+                                                                                                   }));
             </script>
         <% } else {%>
 			<div class="my-auto white border-radius pa-5 card-border-radius v-card v-sheet v-sheet--outlined theme--light" style="margin:0 auto;">