UY-1185 fixes

Author: ppiernik

web-common/src/main/java/pl/edu/icm/unity/webui/forms/reg/RequestEditorCreator.java

@@ -256,14 +256,14 @@ private ResolvedInvitationParam getInvitationByCode(String registrationCode) thr
 			invitation = invitationResolver.getInvitationByCode(registrationCode, form);
 		} catch (RegCodeException e)
 		{
-			if (form.isByInvitationOnly() && e.cause.equals(RegCodeException.ErrorCause.MISSING_CODE))
-			{
-				throw new RegCodeException(ErrorCause.MISSING_CODE);
-			}
-
-			if (form.isByInvitationOnly() && e.cause.equals(RegCodeException.ErrorCause.UNRESOLVED_INVITATION))
+			if (e.cause.equals(RegCodeException.ErrorCause.INVITATION_OF_OTHER_FORM))
+				throw e;
+			
+			if (form.isByInvitationOnly() && (e.cause.equals(RegCodeException.ErrorCause.MISSING_CODE)
+					|| e.cause.equals(RegCodeException.ErrorCause.UNRESOLVED_INVITATION)
+					|| e.cause.equals(RegCodeException.ErrorCause.EXPIRED_INVITATION)))
 			{
-				throw new RegCodeException(ErrorCause.UNRESOLVED_INVITATION);
+				throw e;
 			}
 		}
 

web-common/src/main/java/pl/edu/icm/unity/webui/forms/reg/StandaloneRegistrationView.java

@@ -438,7 +438,7 @@ private void showFinalScreen(WorkflowFinalizationConfiguration config)
 		wrapper.setSpacing(false);
 		wrapper.setMargin(false);
 		wrapper.setSizeFull();
-		setSizeFull();
+		//setSizeFull();
 		setCompositionRoot(wrapper);
 
 		WorkflowCompletedComponent finalScreen = new WorkflowCompletedComponent(config,