Fixed GUI glitch when importing a workflow file

Author: car031

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/workflow/designer/WorkflowDesigner.java

@@ -68,6 +68,7 @@ public GUIWorkflow getWorkflow() {
 
 	public void redraw(GUIWorkflow workflow) {
 		this.workflow = workflow;
+		this.workflowToolstrip.setCurrentWorkflow(workflow);
 		drawingPanel.redraw();
 	}
 

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/workflow/designer/WorkflowToolStrip.java

@@ -136,6 +136,10 @@ public WorkflowToolStrip(final WorkflowDesigner designer, PrimitivesToolstrip pr
 		update();
 	}
 
+	public void setCurrentWorkflow(GUIWorkflow currentWorkflow) {
+		this.currentWorkflow = currentWorkflow;
+	}
+	
 	private void addExportButton() {
 		export = new ToolStripButton(I18N.message("eexport"));
 		export.addClickHandler(event -> Util

logicaldoc-util/src/test/java/com/logicaldoc/util/time/DateUtilTest.java

@@ -25,17 +25,15 @@ public void testFormat() {
 		calendar.set(Calendar.SECOND, 13);
 		calendar.set(Calendar.MILLISECOND, 27);
 
-		DateFormat timeZoneFormat = new SimpleDateFormat("Z");
+		assertTrue(DateUtil.format(calendar.getTime())
+				.startsWith("1992-"
+						+ StringUtils.leftPad(Integer.toString(Calendar.getInstance().get(Calendar.MONTH) + 1), 2, '0')
+						+ "-15 23:50:13 "));
 
-		assertEquals(
-				"1992-" + StringUtils.leftPad(Integer.toString(Calendar.getInstance().get(Calendar.MONTH) + 1), 2, '0')
-						+ "-15 23:50:13 " + timeZoneFormat.format(new Date()),
-				DateUtil.format(calendar.getTime()));
-
-		assertEquals(
-				"1992-" + StringUtils.leftPad(Integer.toString(Calendar.getInstance().get(Calendar.MONTH) + 1), 2, '0')
-						+ "-15 23:50:13.027 " + timeZoneFormat.format(new Date()),
-				DateUtil.formatWithMillis(calendar.getTime()));
+		assertTrue(DateUtil.formatWithMillis(calendar.getTime())
+				.startsWith("1992-"
+						+ StringUtils.leftPad(Integer.toString(Calendar.getInstance().get(Calendar.MONTH) + 1), 2, '0')
+						+ "-15 23:50:13.027 "));
 	}
 
 	@Test

logicaldoc-webapp/src/test/java/com/logicaldoc/web/service/SecurityServiceImplTest.java

@@ -309,21 +309,13 @@ public void testKill() {
 	}
 
 	@Test
-	public void testSaveSettings() {
+	public void testSaveSettings() throws ServerException {
 		GUISecuritySettings securitySettings = new GUISecuritySettings();
 		securitySettings.setPwdExpiration(30);
 		securitySettings.setPwdSize(6);
 		securitySettings.setAnonymousKey("xxx");
-
-		String notThrownTest = null;
-		try {
-			testSubject.saveSettings(securitySettings);
-			notThrownTest = "ok";
-		} catch (Exception t) {
-			t.printStackTrace();
-			// Nothing to do
-		}
-		assertEquals("ok", notThrownTest);
+		securitySettings.setContentSecurityPolicy("xyz");
+		testSubject.saveSettings(securitySettings);
 	}
 
 	@Test