Merge pull request #66 from stlhrt/display_false

Display:false constraint should remove fields from scaffolded view
joergrech · Jan 25, 2014 · d716358 · d716358
2 parents d9eb2ed + 9a22477
commit d716358
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/KickstartWithBootstrapGrailsPlugin.groovy b/KickstartWithBootstrapGrailsPlugin.groovy
@@ -3,7 +3,7 @@ import kickstart.CustomDateEditorRegistrar
 class KickstartWithBootstrapGrailsPlugin {
 
 	def title           = "Kickstart with Bootstrap - Good looking websites!"
-	def version         = "1.0.0"
+	def version         = "1.0.3"
 	def license         = "APACHE"
 	def description     = """\
 Kickstart is a plugin for Grails to start your project with a good looking frontend. \

diff --git a/src/templates/scaffolding/_form.gsp b/src/templates/scaffolding/_form.gsp
@@ -10,7 +10,7 @@
 			persistentPropNames << domainClass.identifier.name
 		}
 	}
-	props = domainClass.properties.findAll { persistentPropNames.contains(it.name) && !excludedProps.contains(it.name) }
+	props = domainClass.properties.findAll { persistentPropNames.contains(it.name) && !excludedProps.contains(it.name) && (domainClass.constrainedProperties[it.name] ? domainClass.constrainedProperties[it.name].display : true) }
 	Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[]))
 	for (p in props) {
 		if (p.embedded) {
@@ -29,19 +29,16 @@
 
 private renderFieldForProperty(p, owningClass, prefix = "") {
 	boolean hasHibernate = pluginManager?.hasGrailsPlugin('hibernate') || pluginManager?.hasGrailsPlugin('hibernate4')
-	boolean display = true
 	boolean required = false
 	if (hasHibernate) {
 		cp = owningClass.constrainedProperties[p.name]
-		display = (cp ? cp.display : true)
 		required = (cp ? !(cp.propertyType in [boolean, Boolean]) && !cp.nullable && (cp.propertyType != String || !cp.blank) : false)
-	}
-	if (display) { %>
+	} %>
 			<div class="\${hasErrors(bean: ${propertyName}, field: '${prefix}${p.name}', 'error')} ${required ? 'required' : ''}">
 				<label for="${prefix}${p.name}" class="control-label"><g:message code="${domainClass.propertyName}.${prefix}${p.name}.label" default="${p.naturalName}" /><% if (required) { %><span class="required-indicator">*</span><% } %></label>
 				<div>
 					${renderEditor(p)}
 					<span class="help-inline">\${hasErrors(bean: ${propertyName}, field: '${p.name}', 'error')}</span>
 				</div>
 			</div>
-<%  }   } %>
+<% } %>
diff --git a/src/templates/scaffolding/index.gsp b/src/templates/scaffolding/index.gsp
@@ -18,7 +18,7 @@
 			<tr>
 			<%  excludedProps = Event.allEvents.toList() << 'id' << 'version'
 				allowedNames = domainClass.persistentProperties*.name << 'dateCreated' << 'lastUpdated'
-				props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) && !Collection.isAssignableFrom(it.type) }
+				props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) && !Collection.isAssignableFrom(it.type) && (domainClass.constrainedProperties[it.name] ? domainClass.constrainedProperties[it.name].display : true) }
 				Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[]))
 				props.eachWithIndex { p, i ->
 					if (i < 6) {

diff --git a/src/templates/scaffolding/list.gsp b/src/templates/scaffolding/list.gsp
@@ -18,7 +18,7 @@
 			<tr>
 			<%  excludedProps = Event.allEvents.toList() << 'id' << 'version'
 				allowedNames = domainClass.persistentProperties*.name << 'dateCreated' << 'lastUpdated'
-				props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) && !Collection.isAssignableFrom(it.type) }
+				props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) && !Collection.isAssignableFrom(it.type) && (domainClass.constrainedProperties[it.name] ? domainClass.constrainedProperties[it.name].display : true) }
 				Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[]))
 				props.eachWithIndex { p, i ->
 					if (i < 6) {

diff --git a/src/templates/scaffolding/show.gsp b/src/templates/scaffolding/show.gsp
@@ -17,7 +17,7 @@
 		<tbody>
 		<%  excludedProps = Event.allEvents.toList() << 'id' << 'version'
 			allowedNames = domainClass.persistentProperties*.name << 'dateCreated' << 'lastUpdated'
-			props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) }
+			props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) && (domainClass.constrainedProperties[it.name] ? domainClass.constrainedProperties[it.name].display : true) }
 			Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[]))
 			props.each { p -> %>
 			<tr class="prop">