Closes #14

- Add postLoginUrl configuration options - Fix an error with principalLink tag - Change colors of button group on show user screen
snimavat · Aug 13, 2013 · 28d2e4e · 28d2e4e
1 parent acc91da
commit 28d2e4e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/grails-app/conf/DefaultNimbleConfig.groovy b/grails-app/conf/DefaultNimbleConfig.groovy
@@ -39,6 +39,11 @@ nimble {
 			validregex = '[a-zA-Z0-9]*'
 		}
 		provision { active = false }
+
+		authentication { 
+			postLoginUrl = "/" 
+		}
+
 	}
 
 	fields {

diff --git a/grails-app/controllers/grails/plugin/nimble/core/AuthController.groovy b/grails-app/controllers/grails/plugin/nimble/core/AuthController.groovy
@@ -61,7 +61,7 @@ class AuthController {
 			SecurityUtils.subject.login(authToken)
 			userService.createLoginRecord(request)
 
-			def targetUri = session.getAttribute(AuthController.TARGET) ?: "/"
+			def targetUri = session.getAttribute(AuthController.TARGET) ?: nimbleConfig.localusers.authentication.postLoginUrl
 			session.removeAttribute(AuthController.TARGET)
 
 			log.info("Authenticated user, $username")

diff --git a/grails-app/taglib/NimbleAuthTagLib.groovy b/grails-app/taglib/NimbleAuthTagLib.groovy
@@ -57,7 +57,7 @@ class NimbleAuthTagLib {
 	def principalLink = {attrs, body ->
 		def user = getUser()
 		if (user) {
-			new MarkupBuilder(out).a('href': createLink(controller: 'user', action: 'show', id: id), 'class': 'icon icon_user', body()) {}
+			new MarkupBuilder(out).a('href': createLink(controller: 'user', action: 'show', id: user.id), body()) {}
 		}
 	}
 

diff --git a/grails-app/views/user/show.gsp b/grails-app/views/user/show.gsp
@@ -28,16 +28,16 @@
                      <g:message code="nimble.link.edit" />
                   </g:link>
                   <g:if test="${user.external}">
-                     <g:link controller="user" action="changelocalpassword" id="${user.id}" class="btn btn-small btn-info">
+                     <g:link controller="user" action="changelocalpassword" id="${user.id}" class="btn btn-small btn-success">
                         <g:message code="nimble.link.changelocalpassword" />
                      </g:link>
                   </g:if>
                   <g:else>
-                     <g:link controller="user" action="changepassword" id="${user.id}" class="btn btn-small btn-info">
+                     <g:link controller="user" action="changepassword" id="${user.id}" class="btn btn-small btn-success">
                         <g:message code="nimble.link.changepassword" />
                      </g:link>
                   </g:else>
-                  <a href="#" class="btn btn-warning btn-small dropdown-toggle" data-toggle="dropdown">
+                  <a href="#" class="btn btn-info btn-small dropdown-toggle" data-toggle="dropdown">
                      <g:message code="nimble.link.more" default="More"/>
                      <span class="caret"></span>
                   </a>