finishing post-atuhentication, cuistom validation

Evolveum · Jul 10, 2018 · b3d7606 · b3d7606
1 parent 40527f5
commit b3d7606
Show file tree

Hide file tree

Showing 11 changed files with 323 additions and 1,033 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -805,7 +805,7 @@ private void initLayout() {
         mainHeader.setOutputMarkupId(true);
         add(mainHeader);
 
-        AjaxLink logo = new AjaxLink(ID_LOGO) {
+        AjaxLink<String> logo = new AjaxLink<String>(ID_LOGO) {
             private static final long serialVersionUID = 1L;
 
             @Override
@@ -815,10 +815,17 @@ public void onClick(AjaxRequestTarget target) {
             }
         };
         logo.add(new VisibleEnableBehaviour() {
+
+        	 private static final long serialVersionUID = 1L;
             @Override
             public boolean isVisible() {
                 return !isCustomLogoVisible();
             }
+
+            @Override
+            public boolean isEnabled() {
+            	return isLogoLinkEnabled();
+            }
         });
         mainHeader.add(logo);
 
@@ -2094,6 +2101,10 @@ private boolean isCustomLogoVisible() {
         }
         return false;
     }
+
+    protected boolean isLogoLinkEnabled() {
+    	return true;
+    }
 
     private String getSubscriptionId() {
         if (deploymentInfoModel == null || deploymentInfoModel.getObject() == null) {

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java b/...i/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
@@ -137,11 +137,11 @@ private boolean canAddAndShowEmpty() {
 	}
 
 	private boolean canAddDefault() {
-		return getItemDefinition().canAdd() && getItemDefinition().isEmphasized();
+		return getItemDefinition().canAdd() && (getItemDefinition().isEmphasized() || getItemDefinition().getMinOccurs() == 1);
 	}
 
 	private boolean canReadOrModifyAndNonEmpty() {
-		return getItemDefinition().canRead() && (!getItem().isEmpty() || getItemDefinition().isEmphasized()); //(getItemDefinition().canModify() || getItemDefinition().canRead()) && !getItem().isEmpty();
+		return getItemDefinition().canRead() && (!getItem().isEmpty() || getItemDefinition().isEmphasized() || getItemDefinition().getMinOccurs() == 1); //(getItemDefinition().canModify() || getItemDefinition().canRead()) && !getItem().isEmpty();
 	}
 
 	private boolean canReadOrModifyAndShowEmpty() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageAbstractFlow.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageAbstractFlow.java
@@ -54,8 +54,6 @@ public abstract class PageAbstractFlow extends PageRegistrationBase {
 
 	private static final String ID_TOOLTIP = "tooltip";
 
-	private static final String ID_DYNAMIC_FORM_PANEL = "registrationForm";
-
 	private static final String ID_DYNAMIC_FORM = "dynamicForm";
 	protected static final String ID_CONTENT_AREA = "contentArea";
 
@@ -75,6 +73,7 @@ public abstract class PageAbstractFlow extends PageRegistrationBase {
 	protected abstract WebMarkupContainer initDynamicLayout();
 	protected abstract void submitRegistration(AjaxRequestTarget target);
 	protected abstract boolean isBackButtonVisible();
+	protected abstract ObjectReferenceType getCustomFormRef();
 
 	public PageAbstractFlow() {
 		initalizeModel();
@@ -103,6 +102,8 @@ private void initLayout() {
 
 		}	
 
+		fragment.setOutputMarkupId(true);
+		content.setOutputMarkupId(true);
 		initCaptchaAndButtons(fragment);
 		fragment.add(content);
 		mainForm.add(fragment);
@@ -292,13 +293,13 @@ protected Form<?> getMainForm() {
 //	}
 
 	protected DynamicFormPanel<UserType> createDynamicPanel(Form<?> mainForm, Task task) {
-		final ObjectReferenceType ort = getSelfRegistrationConfiguration().getFormRef();
+		final ObjectReferenceType ort = getCustomFormRef();
 
 		if (ort == null) {
 			return null;
 		}
 
-		return new DynamicFormPanel<>(ID_DYNAMIC_FORM_PANEL,
+		return new DynamicFormPanel<>(ID_DYNAMIC_FORM,
 				getUserModel(), ort.getOid(), mainForm, task, PageAbstractFlow.this, true);
 	}
 
@@ -311,7 +312,7 @@ private void showErrors(AjaxRequestTarget target) {
 
 	protected DynamicFormPanel<UserType> getDynamicFormPanel() {
 		return (DynamicFormPanel<UserType>) get(
-				createComponentPath(ID_MAIN_FORM, ID_DYNAMIC_FORM, ID_DYNAMIC_FORM_PANEL));
+				createComponentPath(ID_MAIN_FORM, ID_CONTENT_AREA, ID_DYNAMIC_FORM));
 	}
 
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
@@ -101,7 +101,7 @@ public boolean isVisible() {
 
         	@Override
         	public void onClick(AjaxRequestTarget target) {
-        		setResponsePage(PageSelfRegistrationNew.class);
+        		setResponsePage(PageSelfRegistration.class);
         	}
         };
         registration.add(new VisibleEnableBehaviour() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
@@ -24,14 +24,18 @@
     <div class="col-md-offset-2 col-md-8 col-lg-offset-2  col-lg-4">
         <div class="panel panel-default">
             <div class="box-body">
-                <form wicket:id="mainForm">
-                    <div style="text-align: center">
+            <form wicket:id="mainForm">
+            	<div wicket:id="contentArea"></div>
+           </form>
+			    <wicket:fragment wicket:id="staticContent">
+			    	<div wicket:id="staticForm">
+			          <div style="text-align: center">
                         <h3 wicket:id="welcome"/>
                     </div>
                     <div>
                         <label wicket:id="additionalText"></label>
                     </div>
-                    <div wicket:id="staticForm">
+
                         <table class="table table-striped">
                             <tr>
                                 <td>
@@ -76,24 +80,30 @@ <h3 wicket:id="welcome"/>
                             </tr>
                         </table>
                     </div>
+					<div class="col-md-offset-6">
+                        <div wicket:id="captcha"/>
 
-                    <div wicket:id="dynamicForm">
+                        <a class="btn btn-default" wicket:id="back"/>
+                        <a class="btn btn-primary" wicket:id="submitRegistration"/>
+                    </div>	                   
+			    </wicket:fragment>
+			    <wicket:fragment wicket:id="dynamicContent">
+			          <div wicket:id="dynamicForm">
                         <div wicket:id="registrationForm"></div>
                     </div>
-
-                    <div class="col-md-offset-6">
+					<div class="col-md-offset-6">
                         <div wicket:id="captcha"/>
 
                         <a class="btn btn-default" wicket:id="back"/>
                         <a class="btn btn-primary" wicket:id="submitRegistration"/>
                     </div>
+			    </wicket:fragment>
 
-                    <div wicket:id="feedback"/>
-                </form>
-
-                <div style="text-align: center">
-                    <h2 wicket:id="registrationInfo"></h2>
-                </div>
+            	<wicket:fragment wicket:id="messageContent">
+	                <div style="text-align: center">
+	                    <h2 wicket:id="registrationInfo"></h2>
+	                </div>
+	            </wicket:fragment>
             </div>
         </div>
     </div>