smaller bugfixes and improvements

Author: mlist

grails-app/conf/BuildConfig.groovy

@@ -73,10 +73,10 @@ grails.project.dependency.resolution = {
         runtime 'mysql:mysql-connector-java:5.1.16'
         runtime "net.sourceforge.jtds:jtds:1.3.1" //MS-SQL
         compile "org.cloudfoundry:cloudfoundry-runtime:0.8.4"
-        build 'org.bouncycastle:bcpg-jdk15on:1.50'
-        build 'org.bouncycastle:bcprov-jdk15on:1.50'
-        compile "org.docx4j:docx4j-ImportXHTML:3.2.2"
-        compile "net.sf.jtidy:jtidy:r938"
+        runtime 'org.bouncycastle:bcpg-jdk15on:1.50'
+        runtime 'org.bouncycastle:bcprov-jdk15on:1.50'
+        runtime "org.docx4j:docx4j-ImportXHTML:3.2.2"
+        runtime "net.sf.jtidy:jtidy:r938"
     }
 
     plugins{

grails-app/controllers/LoginController.groovy

@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2013 
- * Center for Excellence in Nanomedicine (NanoCAN)
- * Molecular Oncology
- * University of Southern Denmark
- * ###############################################
- * Written by:	Markus List
- * Contact: 	mlist'at'health'.'sdu'.'dk
- * Web:		http://www.nanocan.org
- * ###########################################################################
- *	
- *	This file is part of OpenLabFramework.
- *
- *  OpenLabFramework is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *   along with this program. It can be found at the root of the project page.
- *	If not, see <http://www.gnu.org/licenses/>.
- *
- * ############################################################################
- */
+/*
+ * Copyright (C) 2013 
+ * Center for Excellence in Nanomedicine (NanoCAN)
+ * Molecular Oncology
+ * University of Southern Denmark
+ * ###############################################
+ * Written by:	Markus List
+ * Contact: 	mlist'at'health'.'sdu'.'dk
+ * Web:		http://www.nanocan.org
+ * ###########################################################################
+ *	
+ *	This file is part of OpenLabFramework.
+ *
+ *  OpenLabFramework is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with this program. It can be found at the root of the project page.
+ *	If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ############################################################################
+ */
 import grails.converters.JSON
 
 import javax.servlet.http.HttpServletResponse
@@ -95,10 +95,9 @@ class LoginController {
      */
     def authAjax = {
         // CAS redirect
-        println "authAjax"
         def newParams = params
         newParams.bodyOnly = true
-        redirect(controller: "login", action: "auth", params: newParams)
+        redirect(controller: "login", action: "auth", params: params)
 
         //response.setHeader 'Location', SpringSecurityUtils.securityConfig.auth.ajaxLoginFormUrl
         //response.sendError HttpServletResponse.SC_UNAUTHORIZED

grails-app/controllers/org/openlab/content/DashboardController.groovy

@@ -48,7 +48,7 @@ class DashboardController {
 	}
 
 	def dashboard = {
-        if(!springSecurityService.isLoggedIn()){
+        if(!springSecurityService?.loggedIn){
             redirect(action: "auth", controller: "login", params: [bodyOnly:false])
             return
         }

modules/OpenLabNotes

@@ -84,7 +84,7 @@ class ${className}Controller {
             response.contentType = grailsApplication.config.grails.mime.types[params.format]
             response.setHeader("Content-disposition", "attachment; filename=${propertyName}.\${params.extension}")
 
-            def notallowed = ["dbName", "springSecurityService", "typeLabel", "beforeInsert", "beforeUpdate"]
+            def notallowed = ["dbName", "springSecurityService", "typeLabel", "beforeInsert", "beforeUpdate", "methods"]
             def fields = new DefaultGrailsDomainClass(${className}.class).persistentProperties.findAll{ !notallowed.contains(it.name) }.collect{it.name}
 
             exportService.export(params.format, response.outputStream, ${propertyName}List, fields?:[], [:], [:], [:])

src/templates/scaffolding/Controller.groovy

@@ -1,6 +1,6 @@
 <% import grails.persistence.Event %>
 <%=packageName%>
-<%	excludedProps = Event.allEvents.toList() << 'version' << 'attachable'  << 'id' << 'acl' %>
+<%	excludedProps = Event.allEvents.toList() << 'version' << 'attachable'  << 'id' << 'acl' << 'accessLevel' %>
 <% historyProps = [] << 'creator' << 'dateCreated' << 'lastModifier' << 'lastUpdated' %>
 
 <div id="createAdditionalContent"></div>

src/templates/scaffolding/_createAdditionalContent.gsp

@@ -2,7 +2,7 @@
 <% import grails.persistence.Event %>
 
 <% historyProps = [] << 'creator' << 'dateCreated' << 'lastModifier' << 'lastUpdate' %>
-<%  excludedProps = Event.allEvents.toList() << 'version' << 'dateCreated' << 'lastUpdated' << 'token'
+<%  excludedProps = Event.allEvents.toList() << 'version' << 'dateCreated' << 'lastUpdated' << 'token' << 'accessLevel' << 'shared'
 	persistentPropNames = domainClass.persistentProperties*.name
 	boolean hasHibernate = pluginManager?.hasGrailsPlugin('hibernate')
 	if (hasHibernate && org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsDomainBinder.getMapping(domainClass)?.identity?.generator == 'assigned') {

src/templates/scaffolding/_form.gsp

@@ -31,15 +31,15 @@
                     Results per page: <g:select name="max" value="\${params.max?:10}" from="\${10..100}" class="range"/>
                     <% if (domainClass.properties.find{ it.name == 'creator'}){%>
                     Creator: <g:select name="creatorFilter" from="\${org.openlab.security.User.list().collect{it.username}}"
-                                       value="\${params.creatorFilter?:''}" noSelection="['':'']"/>
+                                       value="\${params.creatorFilter?:''}" noSelection="['':'']" class="select2 many-to-many"/>
                     <% } %>
                     <% if (domainClass.properties.find{ it.name == 'lastModifier'}){%>
                     Last Modifier: <g:select name="lastModifierFilter" from="\${org.openlab.security.User.list().collect{it.username}}"
-                                             value="\${params.lastModifierFilter?:''}" noSelection="['':'']"/>
+                                             value="\${params.lastModifierFilter?:''}" noSelection="['':'']" class="select2 many-to-many"/>
                     <% } %>
                     <% if (domainClass.properties.find{ it.name == 'projects'}){%>
                     Project: <g:select name="projectFilter" from="\${org.openlab.main.Project.list().collect{it.name}}"
-                                       value="\${params.projectFilter?:''}" noSelection="['':'']"/>
+                                       value="\${params.projectFilter?:''}" noSelection="['':'']" class="select2 many-to-many"/>
                     <% } %>
                     <g:submitButton name="Filter"/>
                 </g:formRemote>
@@ -49,7 +49,7 @@
 			<table>
 				<thead>
 					<tr>
-					<%  excludedProps = Event.allEvents.toList() << 'id' << 'version'
+					<%  excludedProps = Event.allEvents.toList() << 'id' << 'version' << 'accessLevel' << 'shared'
 						allowedNames = domainClass.persistentProperties*.name << 'dateCreated' << 'lastUpdated'
 						props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) && it.type != null && !Collection.isAssignableFrom(it.type) }
 						Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[]))

src/templates/scaffolding/list.gsp

@@ -16,7 +16,7 @@
 			</g:if>
 			<div class="ui-grid-a">
                 <% historyProps = [] << 'creator' << 'dateCreated' << 'lastModifier' << 'lastUpdate' %>
-                <%  excludedProps = Event.allEvents.toList() << 'id' << 'version'
+                <%  excludedProps = Event.allEvents.toList() << 'id' << 'version' << 'accessLevel'
 				allowedNames = domainClass.persistentProperties*.name
 				props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) && !historyProps.contains(it.name)}
 				Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[]))

src/templates/scaffolding/mobile_show.gsp

@@ -27,7 +27,7 @@
 			</g:if>
 			<ol class="property-list ${domainClass.propertyName}">
                 <% historyProps = [] << 'creator' << 'dateCreated' << 'lastModifier' << 'lastUpdate' %>
-                <%  excludedProps = Event.allEvents.toList() << 'id' << 'version'
+                <%  excludedProps = Event.allEvents.toList() << 'id' << 'version' << 'accessLevel' << 'shared'
 				allowedNames = domainClass.persistentProperties*.name
 				props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) && !historyProps.contains(it.name)}
 				Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[]))