Merge branch 'feature/menu' of https://github.com/Evolveum/midpoint i…

…nto feature/menu

.tx/config

@@ -5,5 +5,5 @@ host = https://www.transifex.com
 file_filter = gui/admin-gui/src/main/resources/localization/Midpoint_<lang>.properties
 source_file = gui/admin-gui/src/main/resources/localization/Midpoint.properties
 source_lang = en
-type = PROPERTIES
+type = UNICODEPROPERTIES
 

config/sql/_all/h2-upgrade-3.2-3.3.sql

@@ -12,3 +12,29 @@ alter table m_sequence
     add constraint fk_sequence
     foreign key (oid)
     references m_object;
+
+alter table m_user_photo
+    drop constraint fk_user_photo;
+
+alter table m_user_photo rename to m_focus_photo;
+
+alter table m_focus_photo
+    add constraint fk_focus_photo
+    foreign key (owner_oid)
+    references m_focus;
+
+
+alter table m_focus add hasPhoto boolean not null default false after validityStatus;
+
+update m_focus set hasPhoto = false;
+update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+    where m_focus.oid in (select oid from m_user);
+
+-- don't know how to drop default value, leaving it there
+
+alter table m_user drop column hasPhoto;
+
+
+
+
+

config/sql/_all/mysql-upgrade-3.2-3.3.sql

@@ -13,4 +13,25 @@ alter table m_sequence
 alter table m_sequence
     add constraint fk_sequence
     foreign key (oid)
-    references m_object (oid);
+    references m_object (oid);
+
+rename table m_user_photo to m_focus_photo;
+
+alter table m_focus add hasPhoto bit not null default 0;
+
+update m_focus set hasPhoto = 0;
+update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+where m_focus.oid in (select oid from m_user);
+
+alter table m_focus alter column hasPhoto drop default;
+
+alter table m_user drop column hasPhoto;
+
+alter table m_focus_photo
+  drop foreign key fk_user_photo;
+
+alter table m_focus_photo
+  add constraint fk_focus_photo
+  foreign key (owner_oid)
+  references m_focus (oid);
+

config/sql/_all/oracle-upgrade-3.2-3.3.sql

@@ -12,3 +12,23 @@ alter table m_sequence
     add constraint fk_sequence
     foreign key (oid)
     references m_object;
+
+
+
+alter table m_user_photo
+    drop constraint fk_user_photo;
+
+rename m_user_photo to m_focus_photo;
+
+alter table m_focus_photo
+    add constraint fk_focus_photo
+    foreign key (owner_oid)
+    references m_focus;
+
+alter table m_focus add hasPhoto number(1,0) default 0 not null;
+update m_focus set hasPhoto = 0;
+update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+    where m_focus.oid in (select oid from m_user);
+alter table m_focus modify hasPhoto default null;
+
+alter table m_user drop column hasPhoto;

config/sql/_all/postgresql-upgrade-3.2-3.3.sql

@@ -11,4 +11,28 @@ alter table m_sequence
 alter table m_sequence
     add constraint fk_sequence
     foreign key (oid)
-    references m_object;
+    references m_object;
+
+alter table m_user_photo rename to m_focus_photo;
+
+alter table m_focus add hasPhoto boolean not null default FALSE;
+update m_focus set hasPhoto = false;
+update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+  where m_focus.oid in (select oid from m_user);
+alter table m_focus alter column hasPhoto drop default;
+
+alter table m_focus_photo
+  drop constraint m_user_photo_pkey;
+
+alter table m_focus_photo
+  add constraint m_focus_photo_pkey primary key(owner_oid);
+
+alter table m_focus_photo
+  drop constraint fk_user_photo;
+
+alter table m_focus_photo
+  add constraint fk_focus_photo
+  foreign key (owner_oid)
+  references m_focus;
+
+alter table m_user drop column hasPhoto;

config/sql/_all/sqlserver-upgrade-3.2-3.3.sql

@@ -12,3 +12,24 @@ alter table m_sequence
     add constraint fk_sequence
     foreign key (oid)
     references m_object;
+
+exec sp_rename m_user_photo, m_focus_photo;
+
+alter table m_focus add hasPhoto bit not null constraint default_constraint default 0;
+
+update m_focus set hasPhoto = 0;
+    update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+    where m_focus.oid in (select oid from m_user);
+
+alter table m_focus drop constraint default_constraint;
+
+alter table m_user drop column hasPhoto;
+
+alter table m_focus_photo
+    drop constraint fk_user_photo;
+
+alter table m_focus_photo
+    add constraint fk_focus_photo
+    foreign key (owner_oid)
+    references m_focus;
+

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java

@@ -251,14 +251,15 @@ public String load() {
                     ObjectReferenceType ref = config.getTemplateRef();
 
                     if(ref != null){
-                        String oid = ref.getOid();
-
-                        PrismObject<ObjectTemplateType> template = WebModelUtils.loadObject(ObjectTemplateType.class, oid, result, getPageBase());
-
-                        if(template != null){
-                            ObjectTemplateType tmp = template.asObjectable();
-                            sb.append(WebMiscUtil.getOrigStringFromPoly(tmp.getName())).append(": ");
-                        }
+                    	sb.append(WebMiscUtil.getOrigStringFromPoly(ref.getTargetName())).append(": ");
+//                        String oid = ref.getOid();
+//
+//                        PrismObject<ObjectTemplateType> template = WebModelUtils.loadObject(ObjectTemplateType.class, oid, result, getPageBase());
+//
+//                        if(template != null){
+//                            ObjectTemplateType tmp = template.asObjectable();
+//                            sb.append(WebMiscUtil.getOrigStringFromPoly(tmp.getName())).append(": ");
+//                        }
                     }
 
                     if(config.getType() != null){

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java

@@ -280,10 +280,24 @@ public void onClick(AjaxRequestTarget target) {
 					}
 				});
 		items.add(item);
+
+		item = new InlineMenuItem(createStringResource("AssignmentTablePanel.menu.showAllAssignments"),
+				new InlineMenuItemAction() {
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						showAllAssignments(target);
+					}
+				});
+		items.add(item);
 
 		return items;
 	}
 
+	protected void showAllAssignments(AjaxRequestTarget target){
+
+	}
+
 	private List<AssignmentEditorDto> getSelectedAssignments() {
 		List<AssignmentEditorDto> selected = new ArrayList<>();
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.html

@@ -28,9 +28,6 @@
 
 		<div wicket:id="assignmentsPreviewPopup" />
 
-
-
-
 		<div class="row">
 			<div class="col-md-6">
 				<div wicket:id="focusForm" />
@@ -53,8 +50,14 @@ <h3>
 				</div>
 <!-- 			</div> -->
 <!-- 			<div class="col-md-6"> -->
-				<div wicket:id="assignmentsContainer">
-					<div wicket:id="assignmentsPanel" />
+<!-- 				<div class="row"> -->
+<!--             		<a class="btn btn-info" wicket:id="recomputeAssignments" /> -->
+<!--         		</div> -->
+
+				<div class="row assignable-header">
+					<div wicket:id="assignmentsContainer">
+						<div wicket:id="assignmentsPanel" />
+					</div>
 				</div>
 			</div>
 			<!--                     <div class="row assignable-header"> -->
@@ -76,6 +79,7 @@ <h3>
 			<!--             </div> -->
 
 		</div>
+
 	</wicket:panel>
 </body>
 </html>

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java

@@ -50,6 +50,7 @@
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.assignment.AssignmentEditorDto;
 import com.evolveum.midpoint.web.component.assignment.AssignmentEditorDtoType;
 import com.evolveum.midpoint.web.component.assignment.AssignmentEditorPanel;
@@ -149,6 +150,8 @@ public abstract class BaseFocusPanel<T extends FocusType> extends Panel{
 	    private static final String ID_ASSIGNMENT_MENU = "assignmentMenu";
 	    private static final String ID_SHADOW_CHECK_ALL = "shadowCheckAll";
 	    private static final String ID_ASSIGNMENT_CHECK_ALL = "assignmentCheckAll";
+	    private static final String ID_BUTTON_RECOMPUTE_ASSIGNMENTS = "recomputeAssignments";
+
 
 	    private static final String MODAL_ID_RESOURCE = "resourcePopup";
 	    private static final String MODAL_ID_ASSIGNABLE = "assignablePopup";
@@ -236,10 +239,16 @@ protected IModel<String> createDescription(IModel<ObjectWrapper> model) {
 
 	        initResourceModal();
 	        initAssignableModal();
-	        initConfirmationDialogs();
 
+//	        ModalWindow assignmentPreviewPopup = new AssignmentPreviewDialog(MODAL_ID_ASSIGNMENTS_PREVIEW, null, null);
+//	        add(assignmentPreviewPopup);
+
+	        initConfirmationDialogs();
+//	        initButtons();
 //	        initCustomLayout(mainForm);
 	 }
+
+
 	 public ObjectWrapper getFocusWrapper() {
 		return focusModel.getObject();
 	}
@@ -438,7 +447,17 @@ protected void onUpdate(AjaxRequestTarget target) {
 	    }
 
 	 private void initAssignments(WebMarkupContainer assignments) {
-		 AssignmentTablePanel panel = new AssignmentTablePanel<>(ID_ASSIGNMENTS_PANEL, createStringResource("FocusType.assignment"), assignmentsModel);
+
+
+		 AssignmentTablePanel panel = new AssignmentTablePanel(ID_ASSIGNMENTS_PANEL, createStringResource("FocusType.assignment"), assignmentsModel){
+
+			 @Override
+			protected void showAllAssignments(AjaxRequestTarget target) {
+				 AssignmentPreviewDialog dialog = (AssignmentPreviewDialog) getParent().getParent().get(createComponentPath(MODAL_ID_ASSIGNMENTS_PREVIEW));
+	             ((PageAdminFocus)page).recomputeAssignmentsPerformed(dialog, target);
+			}
+
+		 };
 		 assignments.add(panel);
 	    }
 
@@ -935,6 +954,23 @@ public void yesPerformed(AjaxRequestTarget target) {
 	        // add(dialog);
 	    }
 
+//	    private void initButtons(){
+//	    	 AjaxSubmitButton recomputeAssignments = new AjaxSubmitButton(ID_BUTTON_RECOMPUTE_ASSIGNMENTS,
+//		                createStringResource("pageAdminFocus.button.recompute.assignments")) {
+//
+//		            @Override
+//		            protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form<?> form) {
+//		            	AssignmentPreviewDialog dialog = (AssignmentPreviewDialog) getParent().get(createComponentPath(MODAL_ID_ASSIGNMENTS_PREVIEW));
+//		                ((PageAdminFocus)page).recomputeAssignmentsPerformed(dialog, target);
+//		            }
+//
+//		            @Override
+//		            protected void onError(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form<?> form) {
+//		                target.add(getFeedbackPanel());
+//		            }
+//		        };
+//		        add(recomputeAssignments);
+//	    }
 
 
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java

@@ -121,14 +121,12 @@ public PrismObject<T> getObject() {
 
 			@Override
 			public AbstractResource getObject() {
-				// if(summaryObject.getObject().asObjectable().getJpegPhoto() !=
-				// null){
-				// return new ByteArrayResource("image/jpeg",
-				// summaryObject.getObject().asObjectable().getJpegPhoto());
-				// } else {
-				return new ContextRelativeResource("img/placeholder.png");
-				// }
-
+				 if(summaryObject.getObject().asObjectable().getJpegPhoto() != null){
+	                    return new ByteArrayResource("image/jpeg", summaryObject.getObject().asObjectable().getJpegPhoto());
+	                } else {
+	                    return new ContextRelativeResource("img/placeholder.png");
+	                }
+
 			}
 		});
 		summaryContainer.add(img);