Merge branch 'cardtemplatefix' into 'master'

Card template fix

Do not use role reference from card templates

See merge request !309

code/moya-web/WebContent/useradmin/editCardTemplate.xhtml

@@ -24,13 +24,6 @@
 					<h:inputText id="power" value="#{cardView.cardTemplate.power}" size="4" />
 					<h:inputText id="power" value="#{cardView.cardTemplate.power}" size="4" />
 					<h:message for="power" />
 					<h:message for="power" />
 
 
-					<h:outputLabel for="roles" value="#{i18n['cardTemplate.roles']}" />
-					<h:selectManyCheckbox layout="pageDirection" value="#{cardView.cardTemplate.roles}" converter="#{roleConverter}" id="roles">
-
-						<f:selectItems var="role" itemLabel="#{role.name}" value="#{roleDataView.roles}" />
-					</h:selectManyCheckbox>
-					<h:message for="roles"></h:message>
-
 				</h:panelGrid>
 				</h:panelGrid>
 
 
 				<h:commandButton action="#{cardView.saveTemplate()}" value="#{i18n['cardTemplate.save']}" />
 				<h:commandButton action="#{cardView.saveTemplate()}" value="#{i18n['cardTemplate.save']}" />

code/moya-web/WebContent/useradmin/listCardTemplates.xhtml

@@ -31,16 +31,7 @@
 						<h:outputText value="#{card.power}" />
 						<h:outputText value="#{card.power}" />
 
 
 					</h:column>
 					</h:column>
-					<h:column>
-						<f:facet name="header">
-							<h:outputText value="#{i18n['cardTemplate.roles']}" />
-						</f:facet>
-						<h:dataTable value="#{card.roles}" var="cardrole" border="0">
-							<h:column>
-								<h:outputText value="#{cardrole.name}" />
-							</h:column>
-						</h:dataTable>
-					</h:column>
+
 					<h:column>
 					<h:column>
 						<h:link outcome="/useradmin/editCardTemplate" value="#{i18n['cardTemplate.edit']}">
 						<h:link outcome="/useradmin/editCardTemplate" value="#{i18n['cardTemplate.edit']}">
 							<f:param name="templateid" value="#{card.id}" />
 							<f:param name="templateid" value="#{card.id}" />

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/RoleView.java

@@ -157,7 +157,7 @@ public class RoleView extends GenericCDIView {
 	public String save() {
 	public String save() {
 
 
 		setRole(rolebean.mergeChanges(getRole()));
 		setRole(rolebean.mergeChanges(getRole()));
-		return "roleSaved";
+		return null;
 	}
 	}
 
 
 	public String savePermissions() {
 	public String savePermissions() {