kallithea Changeset - 4df4c0eac619

Changeset - 4df4c0eac619

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 16 years ago 2010-04-10 16:42:08
marcin@python-blog.com

Updated admin to show last 5 actions + updated db model

3 files changed with 31 insertions and 5 deletions:

pylons_app/controllers/admin.py

pylons_app/model/db.py

pylons_app/templates/admin.html

0 comments (0 inline, 0 general)

pylons_app/controllers/admin.py

➞

Show inline comments

@@ @@ -3,25 +3,26 @@ import logging @@
 from pylons import request, response, session, tmpl_context as c, url, app_globals as g
 from pylons.controllers.util import abort, redirect
 from pylons_app.lib.base import BaseController, render
 import os
 from mercurial import ui, hg
 from mercurial.error import RepoError
 from ConfigParser import ConfigParser
 from pylons_app.lib import auth
 from pylons_app.model.forms import LoginForm
 import formencode
 import formencode.htmlfill as htmlfill
 from pylons_app.lib.auth import authenticate
 from pylons_app.model import meta
 from pylons_app.model.db import Users, UserLogs
 log = logging.getLogger(__name__)
 class AdminController(BaseController):
     def __before__(self):
         c.staticurl = g.statics
         c.admin_user = session.get('admin_user', False)
         c.admin_username = session.get('admin_username')
     def index(self):
         # Return a rendered template
         if request.POST:
@@ @@ -41,24 +42,27 @@ class AdminController(BaseController): @@
                                                          'password':'invalid password'})
             except formencode.Invalid, error:
                 c.form_result = error.value
                 c.form_errors = error.error_dict or {}
                 html = render('/admin.html')
                 return htmlfill.render(
                     html,
                     defaults=c.form_result,
                     encoding="UTF-8"
+                )
         if c.admin_user:
             sa = meta.Session
             c.users_log = sa.query(UserLogs).limit(10).all()
         return render('/admin.html')
     def hgrc(self, dirname):
         filename = os.path.join(dirname, '.hg', 'hgrc')
         return filename
     def add_repo(self, new_repo):
         #extra check it can be add since it's the command
         if new_repo == '_admin':
             c.msg = 'DENIED'

pylons_app/model/db.py

➞

Show inline comments

@@ @@ -12,15 +12,16 @@ class Users(Base): @@
     user_id = Column("user_id", SLInteger(), nullable=False, unique=True, default=None, primary_key=1)
     username = Column("username", SLText(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     password = Column("password", SLText(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     active = Column("active", SLBoolean(), nullable=True, unique=None, default=None)
     admin = Column("admin", SLBoolean(), nullable=True, unique=None, default=None)
     action_log = relation('UserLogs')
 class UserLogs(Base):
     __tablename__ = 'user_logs'
     __table_args__ = {'useexisting':True}
     id = Column("id", SLInteger(), nullable=False, unique=True, default=None, primary_key=1)
     user_id = Column("user_id", SLInteger(), ForeignKey(u'users.user_id'), nullable=True, unique=None, default=None)
     last_action = Column("last_action", SLText(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     last_action_date = Column("last_action_date", SLDateTime(timezone=False), nullable=True, unique=None, default=None)
     repository = Column("repository", SLText(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action = Column("action", SLText(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action_date = Column("action_date", SLDateTime(timezone=False), nullable=True, unique=None, default=None)
     user = relation('Users')

pylons_app/templates/admin.html

➞

Show inline comments

@@ @@ -24,26 +24,47 @@ @@
 <%def name="main()">
     %if c.admin_user:
     <ul class="submenu">
         <li>
             ${h.link_to(u'Repos',h.url('repos'))}
         </li>
         <li>
             ${h.link_to(u'Users',h.url('users'))}
         </li>
     </ul>
     <br/>
     <div>
         <h2>Hi !</h2>
         <h2>Welcome ${c.admin_username}</h2>
         <div>Last 5 user actions</div>
         %if c.users_log:
 	        <table>
 	        <tr>
 	        	<td>${_('Username')}</td>
 	        	<td>${_('Repository')}</td>
 	        	<td>${_('Action')}</td>
 	        	<td>${_('Date')}</td>
 	        </tr>
 	        %for cnt,l in enumerate(c.users_log):
 				<tr class="parity${cnt%2}">
 					<td>${l.user.username}</td>
 					<td>${l.repository}</td>
 					<td>${l.action}</td>
 					<td>${l.action_date}</td>
 				</tr>
 			%endfor
 			</table>
 		%else:
 			${_('No actions yet')}
 		%endif
     </div>
     %else:
         <div>
         <br />
         <h2>${_('Login')}</h2>
         ${h.form(h.url.current())}
         <table>
             <tr>
                 <td>${_('Username')}</td>
                 <td>${h.text('username')}</td>
                 <td>${get_form_error('username')} </td>
             </tr>

0 comments (0 inline, 0 general)