Merge Equipe 3

.settings/org.eclipse.core.resources.prefs

@@ -1,23 +1,23 @@
-eclipse.preferences.version=1
-encoding//.link_to_grails_plugins/jquery-1.7.1/grails-app/i18n=UTF-8
-encoding//.link_to_grails_plugins/jquery-1.7.1/grails-app/i18n/messages.properties=UTF-8
-encoding//.link_to_grails_plugins/jquery-ui-1.8.15/grails-app/i18n/messages.properties=UTF-8
-encoding//.link_to_grails_plugins/pdf-0.6/grails-app/i18n/messages.properties=UTF-8
-encoding//.link_to_grails_plugins/resources-1.1.6/grails-app/i18n=UTF-8
-encoding//.link_to_grails_plugins/resources-1.1.6/grails-app/i18n/messages.properties=UTF-8
-encoding//grails-app/i18n=UTF-8
-encoding//grails-app/i18n/messages.properties=UTF-8
-encoding//grails-app/i18n/messages_cs_CZ.properties=UTF-8
-encoding//grails-app/i18n/messages_da.properties=UTF-8
-encoding//grails-app/i18n/messages_de.properties=UTF-8
-encoding//grails-app/i18n/messages_es.properties=UTF-8
-encoding//grails-app/i18n/messages_fr.properties=UTF-8
-encoding//grails-app/i18n/messages_it.properties=UTF-8
-encoding//grails-app/i18n/messages_ja.properties=UTF-8
-encoding//grails-app/i18n/messages_nl.properties=UTF-8
-encoding//grails-app/i18n/messages_pt_BR.properties=UTF-8
-encoding//grails-app/i18n/messages_pt_PT.properties=UTF-8
-encoding//grails-app/i18n/messages_ru.properties=UTF-8
-encoding//grails-app/i18n/messages_sv.properties=UTF-8
-encoding//grails-app/i18n/messages_th.properties=UTF-8
-encoding//grails-app/i18n/messages_zh_CN.properties=UTF-8
+eclipse.preferences.version=1
+encoding//.link_to_grails_plugins/jquery-1.7.1/grails-app/i18n=UTF-8
+encoding//.link_to_grails_plugins/jquery-1.7.1/grails-app/i18n/messages.properties=UTF-8
+encoding//.link_to_grails_plugins/jquery-ui-1.8.15/grails-app/i18n/messages.properties=UTF-8
+encoding//.link_to_grails_plugins/pdf-0.6/grails-app/i18n/messages.properties=UTF-8
+encoding//.link_to_grails_plugins/resources-1.1.6/grails-app/i18n=UTF-8
+encoding//.link_to_grails_plugins/resources-1.1.6/grails-app/i18n/messages.properties=UTF-8
+encoding//grails-app/i18n=UTF-8
+encoding//grails-app/i18n/messages.properties=UTF-8
+encoding//grails-app/i18n/messages_cs_CZ.properties=UTF-8
+encoding//grails-app/i18n/messages_da.properties=UTF-8
+encoding//grails-app/i18n/messages_de.properties=UTF-8
+encoding//grails-app/i18n/messages_es.properties=UTF-8
+encoding//grails-app/i18n/messages_fr.properties=UTF-8
+encoding//grails-app/i18n/messages_it.properties=UTF-8
+encoding//grails-app/i18n/messages_ja.properties=UTF-8
+encoding//grails-app/i18n/messages_nl.properties=UTF-8
+encoding//grails-app/i18n/messages_pt_BR.properties=UTF-8
+encoding//grails-app/i18n/messages_pt_PT.properties=UTF-8
+encoding//grails-app/i18n/messages_ru.properties=UTF-8
+encoding//grails-app/i18n/messages_sv.properties=UTF-8
+encoding//grails-app/i18n/messages_th.properties=UTF-8
+encoding//grails-app/i18n/messages_zh_CN.properties=UTF-8

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="grails.app" version="1.0"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="grails.app" version="1.0"/>
+</faceted-project>

grails-app/conf/Config.groovy

@@ -24,6 +24,7 @@ grails {
 }
 #end
 
+
 grails.project.groupId = appName // change this to alter the default package name and Maven publishing destination
 grails.mime.file.extensions = true // enables the parsing of file extensions from URLs into the request format
 grails.mime.use.accept.header = false

grails-app/conf/DataSource.groovy

@@ -57,4 +57,4 @@ environments {
         }
     }
 }
-/**/
+/**/

grails-app/controllers/rgms/AuthController.groovy

@@ -23,14 +23,14 @@ class AuthController {
 //        def subject = SecurityUtils.getSubject();
         Member member = Member.findByUsername(params.username)
 
-        print("ENTROU no signIn\nEnabled == "+member.enabled)
-        
-        if(member.enabled == false){
+        print("ENTROU no signIn\nEnabled == "+member.enabled)   
+
+		if(member.enabled == false){
             render "Please wait the administrator to unlock your access to system.\n\nThanks."
             return
         }
 
-        def authToken = new UsernamePasswordToken(params.username, params.password as String)
+		def authToken = new UsernamePasswordToken(params.username, params.password as String)
 
         // Support for "remember me"
         if (params.rememberMe) {

grails-app/controllers/rgms/MemberController.groovy

@@ -20,12 +20,15 @@ class MemberController {
 
     def create = {
 		def member = new Member(params)
+
+#if($default_values)             
 		def defaultValues = DefaultValueManager.getInstance()
-		member.setEmail("@"+defaultValues.getPropertyValue(DefaultValueManager.Domain))
+                member.setEmail("@"+defaultValues.getPropertyValue(DefaultValueManager.Domain))
 		member.setUniversity(defaultValues.getPropertyValue(DefaultValueManager.Univeristy))
 		member.setCountry(defaultValues.getPropertyValue(DefaultValueManager.Country))
 		member.setCity(defaultValues.getPropertyValue(DefaultValueManager.City))
-
+#end		
+
         [memberInstance: member]
     }
 
@@ -57,6 +60,8 @@ class MemberController {
            //end feature record
        #end
 
+       //end feature record
+
         if (!memberInstance.save(flush: true)) { 
             render(view: "create", model: [memberInstance: memberInstance])
             return
@@ -66,8 +71,10 @@ class MemberController {
             to memberInstance.email
             from grailsApplication.config.grails.mail.username
             subject "[GRMS] Your account was successfully created!"
-            body "Hello ${ memberInstance.name},\n\nYour account was successfully created!\n\nHere is your username: ${ username} and password: ${ password}\n\n${ createLink(absolute:true,uri:'/')}\n\nBest Regards,\nAdministrator of the Research Group Management System".toString()
-        }
+			#literal()
+			body "Hello ${memberInstance.name},\n\nYour account was successfully created!\n\nHere is your username: ${username} and password: ${password}\n\n ${ createLink(absolute:true,uri:'/') }\n\nBest Regards,\nAdministrator of the Research Group Management System".toString()
+			#end
+		}
 
         flash.message = message(code: 'default.created.message', args: [message(code: 'member.label', default: 'Member'), memberInstance.id])
         redirect(action: "show", id: memberInstance.id)

grails-app/domain/rgms/Dissertacao.groovy

@@ -1,23 +1,23 @@
-package rgms
-
-class Dissertacao {
-
-	String author
-	String title
-	String school
-	int year
-	String bibTex
-	int month
-	String arquivo
-
-	Member member
-
-
-    static constraints = {
-		title(nullable:false, blank:false)
-		school(nullable:false, blank:false)
-		year(nullable:false, blank:false)
-		month(maxSize:12)
-		arquivo(blank:true, maxSize:100000000)
-    }
-}
+package rgms
+
+class Dissertacao {
+
+	String author
+	String title
+	String school
+	int year
+	String bibTex
+	int month
+	String arquivo
+
+	Member member
+
+
+    static constraints = {
+		title(nullable:false, blank:false)
+		school(nullable:false, blank:false)
+		year(nullable:false, blank:false)
+		month(maxSize:12)
+		arquivo(blank:true, maxSize:100000000)
+    }
+}

grails-app/domain/rgms/ResearchGroup.groovy

@@ -3,7 +3,9 @@ package rgms
 class ResearchGroup {
     String name
     String description
+    #if($researchGroupHierarchy)
     ResearchGroup childOf;
+    #end
     static hasMany = [memberships : Membership]
 
     public String toString()
@@ -13,8 +15,11 @@ class ResearchGroup {
     static constraints = {
         name(maxSize:50,blank:false)
         description(maxSize:1000,blank:false)
+
+        #if($researchGroupHierarchy)
         childOf(nullable:true)
-
+        #end
+
     }
 	static getPublications(researchGroup){
 		def memberships = Membership.getAllMembers(researchGroup)

grails-app/domain/rgms/Tese.groovy

@@ -1,20 +1,20 @@
-package rgms
-
-class Tese {
-	String author
-	String title
-	String school
-	int year
-	String bibTex
-	int month
-	String arquivo
-
-    static constraints = {
-		author(nullable:false, blank:false)
-		title(nullable:false, blank:false)
-		school(nullable:false, blank:false)
-		year(nullable:false, blank:false)
-		month(maxSize:12)
-		arquivo(blank:true, maxSize:100000000)
-    }
-}
+package rgms
+
+class Tese {
+	String author
+	String title
+	String school
+	int year
+	String bibTex
+	int month
+	String arquivo
+
+    static constraints = {
+		author(nullable:false, blank:false)
+		title(nullable:false, blank:false)
+		school(nullable:false, blank:false)
+		year(nullable:false, blank:false)
+		month(maxSize:12)
+		arquivo(blank:true, maxSize:100000000)
+    }
+}