@@ -14,9 +14,8 @@ class TopicManager { def topic = new Entity("topic", KeyFactory.createKey("topic", name)) topic.name = name topic.code = getCodeForName(name) - topic.description = """# ${topic.name} - -## About ${topic.name} + topic.users = [] + topic.description = """## About ${topic.name} Enter a brief description about the topic here. src/reggae/TopicManager.groovy @@ -29,6 +29,10 @@ class UserManager { runQuery {} } + public def findUser(key) { + return datastoreService.get(key) + } + Entity findByEmail(String email) { def result = runQuery {query -> query.addFilter("email", Query.FilterOperator.EQUAL, email) src/reggae/UserManager.groovy @@ -19,10 +19,10 @@ if (registeredUser) { topic = topicManager.findTopicByName(topicName) if (!topic) { topic = topicManager.create(topicName) - topic.user = registeredUser.key - topic.save() } - + topic.users.add(registeredUser.key) + topic.save() + if (!registeredUser.topics.contains(topic.key)) { registeredUser.topics.add(topic.key) registeredUser.save() war/WEB-INF/groovy/addtopic.groovy @@ -1,20 +1,16 @@ import reggae.UserManager -def logger = LoggerFactory.getLogger("Reggae.AddUser") def userManager = new UserManager() -def user = userManager.create() -def email = params.email - -logger.info "Adding user with email {}", email +def newUser = userManager.create() params.each { key, value -> - user[key] = value + newUser[key] = value } -params.dateRegistered = new Date() - -user['googleUserKey'] = user.key -user.save() +newUser.dateRegistered = new Date() +newUser.email = user.email +newUser['googleUserId'] = user.getUserId() +newUser.save() -forward '/register.groovy' \ No newline at end of file +sendRedirect '/register.groovy' \ No newline at end of file war/WEB-INF/groovy/adduser.groovy @@ -2,6 +2,8 @@ <% topic = request.getAttribute('topic') markdown = new com.petebevin.markdown.MarkdownProcessor() + uManager = new reggae.UserManager() + %> <head><title>CITCon: ${topic.name}</title> <link rel="layout" href="citcon"/> @@ -12,7 +14,21 @@ <a href="viewtopic.groovy?topic=${topic.code}&mode=edit">Edit Topic</a> <hr/> +<table cellspacing="5pt"> +<td width="50%" valign="top"> +<h1>${topic.name}</h1> <%= markdown.markdown(topic.description) %> +</td> +<td width="50%" valign="top"> + <h1>Users interested in this topic</h1> + <ul> + <% topic.users.each { u -> %> + <li>${uManager.findUser(u).givenName} ${uManager.findUser(u).familyName} + <%}%> +</ul> + +</td> +</table> <hr/> war/viewtopic.gtpl 42f1440c09e5d6bf4b3d40e3e45e78ff54a66761 Mark Derricutt mark@talios.com http://github.com/rvowles/reggae/commit/323f95a5c0aa70a01e5c33cdefd5d99271f7b8be 323f95a5c0aa70a01e5c33cdefd5d99271f7b8be

2009-10-31T23:46:32-07:00

Fix problems with adding users, changed default description for topics e32f53c56930b50636d575b324d70ab07cb53fab Mark Derricutt mark@talios.com