small improvements role catalog + subscription

Evolveum · Mar 20, 2017 · 33ea9a2 · 33ea9a2
1 parent 27487ef
commit 33ea9a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
@@ -58,7 +58,9 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.EnumUtils;
+import org.apache.wicket.ajax.AjaxChannel;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -541,6 +543,13 @@ private ObjectQuery createMemberQuery(String oid) {
 
     private void initCartButton(WebMarkupContainer headerPanel){
         AjaxButton cartButton = new AjaxButton(ID_CART_BUTTON) {
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+                attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
+            }
+
             @Override
             public void onClick(AjaxRequestTarget ajaxRequestTarget) {
                 PageAssignmentsList assignmentsPanel = new PageAssignmentsList(true);

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -2972,7 +2972,7 @@ PageAdmin.menu.assignments=Assignments
 PageAdmin.menu.credentials=Credentials
 PageAdmin.menu.request=Request a role
 PageTemplate.version=Version\:
-PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; and partners.</strong>
+PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; and partners.&nbsp;</strong>
 PageTemplate.toggleNavigation=Toggle navigation
 PageTemplate.user=user
 PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0}

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -2962,7 +2962,7 @@ PageAdmin.menu.assignments=Assignments
 PageAdmin.menu.credentials=Credentials
 PageAdmin.menu.request=Request a role
 PageTemplate.version=Version\:
-PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; and partners.</strong>
+PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; and partners.&nbsp;</strong>
 PageTemplate.toggleNavigation=Toggle navigation
 PageTemplate.user=user
 PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0}