[Repoze-checkins] r1622 - in repoze.shootout/trunk/repoze/shootout: . templates

[Carlos de la Guardia]

Author: Carlos de la Guardia <cguardia at yahoo.com>
Date: Sun Aug 17 02:47:42 2008
New Revision: 1622

Log:
modified routes mapper for users so that username is used for the URL instead of user_id (no very good reason, just a prettier, easy to guess URL).

Modified:
   repoze.shootout/trunk/repoze/shootout/templates/idea.pt
   repoze.shootout/trunk/repoze/shootout/templates/idea_add.pt
   repoze.shootout/trunk/repoze/shootout/templates/main.pt
   repoze.shootout/trunk/repoze/shootout/views.py

Modified: repoze.shootout/trunk/repoze/shootout/templates/idea.pt
==============================================================================
--- repoze.shootout/trunk/repoze/shootout/templates/idea.pt	(original)
+++ repoze.shootout/trunk/repoze/shootout/templates/idea.pt	Sun Aug 17 02:47:42 2008
@@ -7,7 +7,7 @@
     </div>
     <div tal:replace="structure toolbar" />
     <h1>${idea.title}</h1>
-    <p>By <a href="${app_url}/users/${poster.user_id}">${poster.name}</a>.</p>
+    <p>By <a href="${app_url}/users/${poster.username}">${poster.name}</a>.</p>
     <p>Hits: <b>${idea.hits}</b>.</p>
     <p>Misses: <b>${idea.misses}</b>.</p>
     <p tal:content="idea.text"></p>

Modified: repoze.shootout/trunk/repoze/shootout/templates/idea_add.pt
==============================================================================
--- repoze.shootout/trunk/repoze/shootout/templates/idea_add.pt	(original)
+++ repoze.shootout/trunk/repoze/shootout/templates/idea_add.pt	Sun Aug 17 02:47:42 2008
@@ -11,7 +11,7 @@
     </div>
     <h1>Add ${kind}</h1>
     <div class="instructions" tal:condition="target">
-        <p>You are commenting on <a href="${app_url}/ideas/${target.idea_id}">${target.title}</a>, by <a href="${app_url}/users/${target.users.user_id}">${target.users.name}</a>.</p>
+        <p>You are commenting on <a href="${app_url}/ideas/${target.idea_id}">${target.title}</a>, by <a href="${app_url}/users/${target.users.username}">${target.users.name}</a>.</p>
     </div>
     <div class="instructions" tal:condition="not target">
         <p>Please submit your idea.</p>

Modified: repoze.shootout/trunk/repoze/shootout/templates/main.pt
==============================================================================
--- repoze.shootout/trunk/repoze/shootout/templates/main.pt	(original)
+++ repoze.shootout/trunk/repoze/shootout/templates/main.pt	Sun Aug 17 02:47:42 2008
@@ -12,25 +12,25 @@
   <div tal:condition="last10">
   <h3>Latest shots</h3>
   <ul>
-      <li tal:repeat="idea last10"><a href="${app_url}/ideas/${idea.idea_id}">${idea.title}</a>, by <a href="${app_url}/users/${idea.users.user_id}">${idea.users.name}</a> (+${idea.hits}, -${idea.misses}).</li>
+      <li tal:repeat="idea last10"><a href="${app_url}/ideas/${idea.idea_id}">${idea.title}</a>, by <a href="${app_url}/users/${idea.users.username}">${idea.users.name}</a> (+${idea.hits}, -${idea.misses}).</li>
   </ul>
   </div>
   <div tal:condition="top">
   <h3>Most hits</h3>
   <ul>
-      <li tal:repeat="idea top"><a href="${app_url}/ideas/${idea.idea_id}">${idea.title}</a>, by <a href="${app_url}/users/${idea.users.user_id}">${idea.users.name}</a> (+${idea.hits}, -${idea.misses}).</li>
+      <li tal:repeat="idea top"><a href="${app_url}/ideas/${idea.idea_id}">${idea.title}</a>, by <a href="${app_url}/users/${idea.users.username}">${idea.users.name}</a> (+${idea.hits}, -${idea.misses}).</li>
   </ul>
   </div>
   <div tal:condition="bottom">
   <h3>Most misses</h3>
   <ul>
-      <li tal:repeat="idea bottom"><a href="${app_url}/ideas/${idea.idea_id}">${idea.title}</a>, by <a href="${app_url}/users/${idea.users.user_id}">${idea.users.name}</a> (+${idea.hits}, -${idea.misses}).</li>
+      <li tal:repeat="idea bottom"><a href="${app_url}/ideas/${idea.idea_id}">${idea.title}</a>, by <a href="${app_url}/users/${idea.users.username}">${idea.users.name}</a> (+${idea.hits}, -${idea.misses}).</li>
   </ul>
   </div>
   <div tal:condition="hitpct">
   <h3>Best performance</h3>
   <ul>
-      <li tal:repeat="idea hitpct"><a href="${app_url}/ideas/${idea.idea_id}">${idea.title}</a>, by <a href="${app_url}/users/${idea.users.user_id}">${idea.users.name}</a> (+${idea.hits}, -${idea.misses}).</li>
+      <li tal:repeat="idea hitpct"><a href="${app_url}/ideas/${idea.idea_id}">${idea.title}</a>, by <a href="${app_url}/users/${idea.users.username}">${idea.users.name}</a> (+${idea.hits}, -${idea.misses}).</li>
   </ul>
   </div>
 </body>

Modified: repoze.shootout/trunk/repoze/shootout/views.py
==============================================================================
--- repoze.shootout/trunk/repoze/shootout/views.py	(original)
+++ repoze.shootout/trunk/repoze/shootout/views.py	Sun Aug 17 02:47:42 2008
@@ -134,7 +134,7 @@
 
 def user_view(context, request):
     app_url = request.application_url
-    user = DBSession.query(User).filter(User.user_id==context.user).one()
+    user = DBSession.query(User).filter(User.username==context.user).one()
     return render_template_to_response('templates/user.pt',
                                        user=user,
                                        toolbar=toolbar_view(context,request),