Reset password button is taken away on the UserMenuPanel

Evolveum · Oct 15, 2015 · 753af62 · 753af62
1 parent eb2d059
commit 753af62
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.html
@@ -41,9 +41,6 @@
         </li>
         <!-- Menu Footer-->
         <li class="user-footer">
-            <div class="pull-left">
-                <a class="btn btn-default btn-flat" wicket:id="resetPassword"/>
-            </div>
             <div class="pull-right">
                 <a class="btn btn-default btn-flat" wicket:id="logoutLink"/>
             </div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
@@ -41,7 +41,6 @@ public class UserMenuPanel extends BaseSimplePanel {
     private static final String ID_USERNAME = "username";
 
     private static final String ID_EDIT_PROFILE = "editProfile";
-    private static final String ID_RESET_PASSWORD = "resetPassword";
     private static final String ID_PASSWORD_QUESTIONS = "passwordQuestions";
 
     public UserMenuPanel(String id) {
@@ -74,16 +73,6 @@ public String getObject() {
                 createStringResource("UserMenuPanel.logout"));
         add(logoutLink);
 
-        AjaxButton resetPasswords = new AjaxButton(ID_RESET_PASSWORD,
-                createStringResource("UserMenuPanel.resetPasswords")) {
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                setResponsePage(PageMyPasswords.class);
-            }
-        };
-        add(resetPasswords);
-
         AjaxButton editPasswordQ = new AjaxButton(ID_PASSWORD_QUESTIONS,
                 createStringResource("UserMenuPanel.editPasswordQuestions")) {
 

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
@@ -11,13 +11,7 @@
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.page.admin.home.dto.MyPasswordsDto;
 import com.evolveum.midpoint.web.page.admin.home.dto.PasswordAccountDto;
-import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
-import com.evolveum.midpoint.web.util.TooltipBehavior;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCampaignType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCaseType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
-import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -52,6 +46,7 @@ public class ChangePasswordPanel extends SimplePanel<MyPasswordsDto> {
     private static final String OPERATION_LOAD_ACCOUNT = DOT_CLASS + "loadAccount";
 
     private LoadableModel<MyPasswordsDto> model;
+    private boolean midpointAccountSelected = true;
 
     public ChangePasswordPanel(String id) {
         super(id);
@@ -120,14 +115,18 @@ protected void onEvent(final AjaxRequestTarget target) {
                                        if (!passwordAccountDto.isMidpoint()) {
                                            if (passwordAccountDto.getCssClass().equals(PROPAGATED_ACCOUNT_ICON_CSS)) {
                                                passwordAccountDto.setCssClass(SELECTED_ACCOUNT_ICON_CSS);
-                                           } else if (passwordAccountDto.getCssClass().equals(SELECTED_ACCOUNT_ICON_CSS)) {
+                                           } else if (passwordAccountDto.getCssClass().equals(SELECTED_ACCOUNT_ICON_CSS)
+                                                   && passwordAccountDto.isPasswordOutbound() &&
+                                                   midpointAccountSelected) {
+                                               passwordAccountDto.setCssClass(PROPAGATED_ACCOUNT_ICON_CSS);
+                                           }  else if (passwordAccountDto.getCssClass().equals(SELECTED_ACCOUNT_ICON_CSS)) {
                                                passwordAccountDto.setCssClass(DESELECTED_ACCOUNT_ICON_CSS);
                                            } else if (passwordAccountDto.getCssClass().equals(DESELECTED_ACCOUNT_ICON_CSS)) {
                                                passwordAccountDto.setCssClass(SELECTED_ACCOUNT_ICON_CSS);
                                            }
-//                                           rowModel.setObject(passwordAccountDto);
                                            target.add(imagePanel);
                                        } else {
+                                           midpointAccountSelected = !midpointAccountSelected;
                                            if (passwordAccountDto.getCssClass().equals(SELECTED_ACCOUNT_ICON_CSS)) {
                                                passwordAccountDto.setCssClass(DESELECTED_ACCOUNT_ICON_CSS);
                                                updatePropagatedAccountIconsCssClass(DESELECTED_ACCOUNT_ICON_CSS);