Changeset 54

Timestamp:

Nov 9, 2009, 2:04:00 PM (13 years ago)

Author:

keesvb

Message:

Added fix for postgres problems, refactored JQuery code in tag library

Location:

trunk

Files:

• application.properties (modified) (1 diff)
• grails-app/conf/DataSource.groovy (modified) (2 diffs)
• grails-app/conf/NimbleBootStrap.groovy (modified) (1 diff)
• grails-app/taglib/GSCFTagLib.groovy (added)
• grails-app/views/common/_jquerysetup.gsp (added)
• grails-app/views/common/_jqueryuisetup.gsp (added)
• grails-app/views/layouts/main.gsp (modified) (1 diff)
• grails-app/views/query/index.gsp (modified) (1 diff)
• test/unit/GSCFTagLibTests.groovy (added)

trunk/application.properties

@@ -1 +1 @@
 #utf-8
-#Fri Nov 06 13:55:45 CET 2009
+#Mon Nov 09 12:32:00 EST 2009
 plugins.shiro=1.0.1
 plugins.mail=0.9

trunk/grails-app/conf/DataSource.groovy

@@ -35 +35 @@
                          * @see http://wiki.github.com/RobertFischer/autobase/example-usage
                          */
-                        dbCreate =  "update"
+                        dbCreate = "update"
                         username = "gscf"
                         password = "dbnp"
@@ -42 +42 @@
                         driverClassName = "org.postgresql.Driver"
                         url = "jdbc:postgresql://localhost:5432/gscf"
+                        dialect = org.hibernate.dialect.PostgreSQLDialect
 
                         // MySQL
+                        //driverClassName = "com.mysql.jdbc.Driver"
                         //url = "jdbc:mysql://localhost/gscf"
+                        //dialect = "org.hibernate.dialect.MySQL5InnoDBDialect"
 
                         //In memory
-                        //driverClassName = "com.mysql.jdbc.Driver"
                         //url = "jdbc:hsqldb:file:prodDb;shutdown=true"
                 }

trunk/grails-app/conf/NimbleBootStrap.groovy

@@ -46 +46 @@
 
     // Execute any custom Nimble related BootStrap for your application below
+    if (nimble.User.count() == 0) {
 
-    // Create example User account
-    def user = InstanceGenerator.user()
-    user.username = "user"
-    user.pass = 'useR123!'
-    user.passConfirm = 'useR123!'
-    user.enabled = true
+        // Create example User account
+        def user = InstanceGenerator.user()
+        user.username = "user"
+        user.pass = 'useR123!'
+        user.passConfirm = 'useR123!'
+        user.enabled = true
 
-    def userProfile = InstanceGenerator.profile()
-    userProfile.fullName = "Test User"
-    userProfile.owner = user
-    user.profile = userProfile
+        def userProfile = InstanceGenerator.profile()
+        userProfile.fullName = "Test User"
+        userProfile.owner = user
+        user.profile = userProfile
 
-    def savedUser = userService.createUser(user)
-    if (savedUser.hasErrors()) {
-      savedUser.errors.each {
-        log.error(it)
-      }
-      throw new RuntimeException("Error creating example user")
+        def savedUser = userService.createUser(user)
+        if (savedUser.hasErrors()) {
+          savedUser.errors.each {
+            log.error(it)
+          }
+          throw new RuntimeException("Error creating example user")
+        }
+
+        // Create example Administrative account
+        def admins = Role.findByName(AdminsService.ADMIN_ROLE)
+        def admin = InstanceGenerator.user()
+        admin.username = "admin"
+        admin.pass = "admiN123!"
+        admin.passConfirm = "admiN123!"
+        admin.enabled = true
+
+        def adminProfile = InstanceGenerator.profile()
+        adminProfile.fullName = "Administrator"
+        adminProfile.owner = admin
+        admin.profile = adminProfile
+
+        def savedAdmin = userService.createUser(admin)
+        if (savedAdmin.hasErrors()) {
+          savedAdmin.errors.each {
+            log.error(it)
+          }
+          throw new RuntimeException("Error creating administrator")
+        }
+
+        adminsService.add(admin)
+
     }
-
-    // Create example Administrative account
-    def admins = Role.findByName(AdminsService.ADMIN_ROLE)
-    def admin = InstanceGenerator.user()
-    admin.username = "admin"
-    admin.pass = "admiN123!"
-    admin.passConfirm = "admiN123!"
-    admin.enabled = true
-
-    def adminProfile = InstanceGenerator.profile()
-    adminProfile.fullName = "Administrator"
-    adminProfile.owner = admin
-    admin.profile = adminProfile
-
-    def savedAdmin = userService.createUser(admin)
-    if (savedAdmin.hasErrors()) {
-      savedAdmin.errors.each {
-        log.error(it)
-      }
-      throw new RuntimeException("Error creating administrator")
-    }
-
-    adminsService.add(admin)
   }
 

trunk/grails-app/views/layouts/main.gsp

@@ -7 +7 @@
   <link rel="stylesheet" href="${resource(dir:'css',file:'login_panel.css')}" />
   <link rel="shortcut icon" href="${resource(dir:'images',file:'favicon.ico')}" type="image/x-icon" />
-  <!-- 
-    we'd rather like to use this tag, as this tag uses the proper jquery version
-    as maintained by the jquery plugin. However, nimble is conflicting at this
-    moment and tries to fetch jquery from it's plugin resource location (which
-    you can see in the HTML rendered version of this layout in the nimble views.
-    So for now we will use the hardcoded javascript tag instead and comment out:
-    <g:javascript library="jquery" />
-    @see http://jira.codehaus.org/browse/GRAILSPLUGINS-1658
-    @see http://github.com/intient/nimble/issues#issue/55
-  //-->
-  <script type="text/javascript" src="/gscf/js/jquery/jquery-1.3.2.js"></script>
-  <!-- /jquery //-->
-
+  <my:jquery/>
   <!-- layouthead //-->
   <g:layoutHead />

trunk/grails-app/views/query/index.gsp

@@ -3 +3 @@
       <title>Generic Study Capture Framework - Query studies</title>
       <meta name="layout" content="main" />
-      <g:javascript library="jquery"/>
-      <link rel="stylesheet" href="${createLinkTo(dir:'css/jquery-ui', file: 'jquery-ui-1.7.2.custom.css')}"/>
-      <script src="${createLinkTo(dir: 'js', file: 'jquery-ui-1.7.2.custom.min.js')}" type="text/javascript"></script>
+      <my:jqueryui/>
       <script type="text/javascript">
         $(function() {