Skip to content

Fixed issue #37, NullPointerException when generating views #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixed issue #37, NullPointerException when generating views #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3b99f5
Merge pull request #33 from aggug/master
robfletcher Nov 8, 2013
30b0a68
Fixed a typo(looks like that)
amexboy Jan 9, 2015
f3626b2
cp is not bind correctly somehow! Fixex by getting cp in renderEditor
amexboy Jan 9, 2015
9c18124
Changed plugin check to check for either hibernate3 or 4, the name of…
amexboy Jan 9, 2015
5e7a268
Merge branch 'master' of https://github.com/amexboy/grails-angular-sc…
amexboy Jan 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/_NgGenerate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import grails.util.GrailsNameUtils

includeTargets << grailsScript("_GrailsCreateArtifacts")
includeTargets << new File("scaffoldingPluginDir/scripts/_GrailsGenerate.groovy")
includeTargets << new File("$scaffoldingPluginDir/scripts/_GrailsGenerate.groovy")
includeTargets << grailsScript("_GrailsBootstrap")

generateForName = null
Expand Down
2 changes: 1 addition & 1 deletion src/groovy/grails/plugin/angularscaffolding/AngularTemplateGenerator.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class AngularTemplateGenerator extends DefaultGrailsTemplateGenerator
def renderEditor = { property, prefix ->
def domainClass = property.domainClass
def cp
if (pluginManager?.hasGrailsPlugin('hibernate')) {
if (pluginManager?.hasGrailsPlugin('hibernate4')||pluginManager?.hasGrailsPlugin('hibernate3')) {
cp = domainClass.constrainedProperties[property.name]
}

Expand Down
4 changes: 4 additions & 0 deletions src/templates/scaffolding/renderEditor.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<%
if (pluginManager?.hasGrailsPlugin('hibernate4') || pluginManager?.hasGrailsPlugin('hibernate3')) {
cp = domainClass.constrainedProperties[property.name]
}

def name = prefix ? "${prefix}${property.name}" : property.name

switch (property.type) {
Expand Down