[Checkins] SVN: Sandbox/luciano/kirbi/src/kirbi/ further work on
user management
Luciano Ramalho
luciano at ramalho.org
Tue Aug 14 13:09:50 EDT 2007
Log message for revision 78813:
further work on user management
Changed:
U Sandbox/luciano/kirbi/src/kirbi/app.py
U Sandbox/luciano/kirbi/src/kirbi/app_templates/index.pt
U Sandbox/luciano/kirbi/src/kirbi/copy.py
U Sandbox/luciano/kirbi/src/kirbi/user.py
U Sandbox/luciano/kirbi/src/kirbi/user_templates/index.pt
A Sandbox/luciano/kirbi/src/kirbi/user_templates/usersearch.pt
-=-
Modified: Sandbox/luciano/kirbi/src/kirbi/app.py
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/app.py 2007-08-14 16:32:47 UTC (rev 78812)
+++ Sandbox/luciano/kirbi/src/kirbi/app.py 2007-08-14 17:09:50 UTC (rev 78813)
@@ -6,12 +6,16 @@
from zope.interface import Interface, implements
from zope.component import getSiteManager
+sitePac = None
+siteUsers = None
+
class Kirbi(grok.Application, grok.Container):
"""Peer-to-peer library system."""
def __init__(self):
+ global sitePac, siteUsers
super(Kirbi, self).__init__()
- self['pac'] = Pac()
- self.userFolder = self['u'] = UserFolder()
+ sitePac = self['pac'] = Pac()
+ siteUsers = self['u'] = UserFolder()
class Index(grok.View):
pass
Modified: Sandbox/luciano/kirbi/src/kirbi/app_templates/index.pt
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/app_templates/index.pt 2007-08-14 16:32:47 UTC (rev 78812)
+++ Sandbox/luciano/kirbi/src/kirbi/app_templates/index.pt 2007-08-14 17:09:50 UTC (rev 78813)
@@ -9,11 +9,6 @@
Main page stuff will be here.
- <div tal:content="view/request/principal/id" />
-
- <div tal:content="python:view.getSite()['kirbi']" />
-
-
</div>
</body>
</html>
Modified: Sandbox/luciano/kirbi/src/kirbi/copy.py
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/copy.py 2007-08-14 16:32:47 UTC (rev 78812)
+++ Sandbox/luciano/kirbi/src/kirbi/copy.py 2007-08-14 17:09:50 UTC (rev 78813)
@@ -1,5 +1,5 @@
import grok
-from zope.interface import Interface, implements
+from zope.interface import Interface, implements, invariant
from zope import schema
class ICopy(Interface):
@@ -27,8 +27,9 @@
implements(ICopy)
- def __init__(self, login, name, password):
- super(User, self).__init__()
+ def __init__(self, book_id):
+ super(User, self).__init__()
+
class ILease(Interface):
"""A book lease."""
Modified: Sandbox/luciano/kirbi/src/kirbi/user.py
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/user.py 2007-08-14 16:32:47 UTC (rev 78812)
+++ Sandbox/luciano/kirbi/src/kirbi/user.py 2007-08-14 17:09:50 UTC (rev 78813)
@@ -51,6 +51,9 @@
return '%s (%s)' % (self.name, self.login)
else:
return self.login
+
+class Index(grok.View):
+ grok.context(User)
class PrincipalInfoAdapter(grok.Adapter):
grok.context(User)
@@ -79,8 +82,9 @@
def description(self):
return self.context.name_and_login()
-class Index(grok.View):
+class UserSearch(grok.View):
grok.context(UserFolder)
+ grok.name('index')
def update(self, query=None):
self.results_title = '%d users' % len(self.context)
@@ -92,6 +96,7 @@
@grok.action('Add entry')
def add(self, **data):
- self.context[data['login']] = User(**data)
- self.redirect(self.url('u'))
+ login = data['login']
+ self.context[login] = User(**data)
+ self.redirect(self.url(login))
Modified: Sandbox/luciano/kirbi/src/kirbi/user_templates/index.pt
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/user_templates/index.pt 2007-08-14 16:32:47 UTC (rev 78812)
+++ Sandbox/luciano/kirbi/src/kirbi/user_templates/index.pt 2007-08-14 17:09:50 UTC (rev 78813)
@@ -6,22 +6,18 @@
</head>
<body>
- <span metal:fill-slot="content_title">Users</span>
+ <span metal:fill-slot="content_title">
+ <span tal:replace="view/context/__name__" />'s collection
+ </span>
<span metal:fill-slot="content_actions">
<form class="search" action=".">
<input type="text" name="query">
- <input type="submit" name="submit" value="search">
+ <input type="submit" name="submit" value="search my books">
</form>
</span>
<div metal:fill-slot="content">
- <h3 tal:content="view/results_title">999 items matched the query</h3>
- <table>
- <tr tal:repeat="item view/context/values">
- <th align="right" tal:content="repeat/item/number" />
- <td tal:content="item/name_and_login" />
- </tr>
- </table>
+ User's stuff
</div>
</body>
Added: Sandbox/luciano/kirbi/src/kirbi/user_templates/usersearch.pt
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/user_templates/usersearch.pt (rev 0)
+++ Sandbox/luciano/kirbi/src/kirbi/user_templates/usersearch.pt 2007-08-14 17:09:50 UTC (rev 78813)
@@ -0,0 +1,28 @@
+<html metal:use-macro="context/@@master/page">
+<head>
+ <title metal:fill-slot="title">
+ Public Catalog
+ </title>
+
+</head>
+<body>
+ <span metal:fill-slot="content_title">Users</span>
+ <span metal:fill-slot="content_actions">
+ <form class="search" action=".">
+ <input type="text" name="query">
+ <input type="submit" name="submit" value="search">
+ </form>
+ </span>
+ <div metal:fill-slot="content">
+
+ <h3 tal:content="view/results_title">999 users matched the query</h3>
+ <table>
+ <tr tal:repeat="item view/context/values">
+ <th align="right" tal:content="repeat/item/number" />
+ <td tal:content="item/name_and_login" />
+ </tr>
+ </table>
+
+ </div>
+</body>
+</html>
More information about the Checkins
mailing list