Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Oct 6, 2015 · 84d6214 · 84d6214
2 parents 1441d17 + b6ed885
commit 84d6214
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.java
@@ -76,7 +76,7 @@ protected void onComponentTag(final ComponentTag tag) {
                             if (webApplication != null) {
                                 ServletContext servletContext = webApplication.getServletContext();
                                 if (servletContext != null) {
-                                    rootContext = servletContext.getServletContextName();
+                                    rootContext = servletContext.getContextPath();
                                 }
                             }
                         }

diff --git a/gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml b/gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
@@ -96,22 +96,20 @@
     </cleanupPolicy>
     <adminGuiConfiguration>
         <userDashboardLink>
-            <targetUrl>/midpoint/admin/users</targetUrl>
+            <targetUrl>/admin/users</targetUrl>
             <label>Users</label>
             <icon>
                 <cssClass>fa fa-users</cssClass>
             </icon>
             <color>red</color>
-            <authorization>http://</authorization>
         </userDashboardLink>
         <userDashboardLink>
-            <targetUrl>/midpoint/admin/org/tree</targetUrl>
+            <targetUrl>/admin/org/tree</targetUrl>
             <label>Organizations</label>
             <icon>
                 <cssClass>fa fa-bank</cssClass>
             </icon>
             <color>green</color>
-            <authorization>http://</authorization>
         </userDashboardLink>
     </adminGuiConfiguration>
 </systemConfiguration>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml b/gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
@@ -21,6 +21,7 @@
     <authorization>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#dashboard</action>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#myPasswords</action>
+        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#self</action>
     </authorization>
     <authorization>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#read</action>