Changeset 2086

Timestamp:

Nov 7, 2011, 11:50:13 AM (11 years ago)

Author:

work@…

Message:

• show shibboleth user properly

Location:

trunk/grails-app

Files:

• domain/dbnp/authentication/SecUser.groovy (modified) (1 diff)
• taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (1 diff)

trunk/grails-app/domain/dbnp/authentication/SecUser.groovy

@@ -59 +59 @@
                 executeUpdate( "DELETE FROM SessionAuthenticatedUser sau WHERE sau.secUser = :secUser", [ "secUser": this ] );
         }
+
+        /**
+         * return the text representation of this user
+         * @return
+         */
+        def String toString() {
+                if (shibbolethUser) {
+                        return displayName
+                } else {
+                        return username
+                }
+        }
 }

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -370 +370 @@
                         attrs.description = '';
                 }
-                
+
+                def userList = []
+                SecUser.findAll().each {
+                        userList[ userList.size() ] = ['name':(it.shibbolethUser) ? it.displayName : it.username, 'id':it.id]
+                }
+
                 out << '<form id="' + attrs.name + '_form" onSubmit="return false;">';
                 out << select(
                         name: attrs.get("name"),
                         value: '',
-                        from: SecUser.list(),
-                        optionValue: 'username',
+                        from: userList,
+                        optionValue: 'name',
                         optionKey: 'id',
                         style: 'width: 400px;'