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

Evolveum · Jun 16, 2017 · b1b576b · b1b576b
2 parents de09982 + 64ca922
commit b1b576b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 324 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -70,7 +70,7 @@ public class PageAssignmentsList<F extends FocusType> extends PageBase{
     private static final String ID_DESCRIPTION = "description";
     private static final String ID_TARGET_USER_PANEL = "targetUserPanel";
 
-    private static final Trace LOGGER = TraceManager.getTrace(PageRequestRole.class);
+    private static final Trace LOGGER = TraceManager.getTrace(PageAssignmentsList.class);
     private static final String DOT_CLASS = PageAssignmentsList.class.getName() + ".";
     private static final String OPERATION_REQUEST_ASSIGNMENTS = DOT_CLASS + "requestAssignments";
     private static final String OPERATION_WF_TASK_CREATED = "com.evolveum.midpoint.wf.impl.WfHook.invoke";

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.html
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java
diff --git a/...security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java b/...security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
@@ -307,9 +307,6 @@ public class AuthorizationConstants {
 	public static final QName AUTZ_UI_SELF_PROFILE_QNAME = new QName(NS_AUTHORIZATION_UI, "selfProfile");
 	public static final String AUTZ_UI_SELF_PROFILE_URL = NS_AUTHORIZATION_UI + "#selfProfile";
 
-	public static final QName AUTZ_UI_SELF_REQUEST_ROLE_QNAME = new QName(NS_AUTHORIZATION_UI, "selfRequestRole");
-	public static final String AUTZ_UI_SELF_REQUEST_ROLE_URL = NS_AUTHORIZATION_UI + "#selfRequestRole";
-
 	public static final QName AUTZ_UI_SELF_ASSIGNMENT_SHOP_KART_QNAME = new QName(NS_AUTHORIZATION_UI, "selfRequestAssignment");
 	public static final String AUTZ_UI_SELF_ASSIGNMENT_SHOP_KART_URL = NS_AUTHORIZATION_UI + "#selfRequestAssignment";