← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/admin/publishing.py

  • Committer: matt.giuca
  • Date: 2009-01-14 10:10:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:branches%2Fstorm:1132
The new ivle.database.User class is now used in Request and usrmgt, which
    means it is now almost universally used in favour of ivle.user.User (now
    deprecated).

Noticeable change: The minor bug where the change to a user object in the
    database is not reflected in the user's session (eg. changing nick doesn't
    update title until log out).

ivle.dispatch:
    Session now contains 'login' (username string) rather than 'user' (full
        ivle.user.User object). This is a unicode string now.

    req.user is now a ivle.database.User object rather than an ivle.user.User
        object. This makes for a whole lot of really subtle differences, but
        largely conforms to the same interface. Note that strings must now all
        be unicode.

    login: Removed use of ivle.db. Now uses User object.

    html: Now handles unicode login and config options.

ivle.db: Removed update_user. Now replaced with Storm model.

ivle.database: Renamed has_cap back to hasCap (saved for later). Fixed small
    unicode bug.

ivle.makeuser.make_svn_auth now takes a store object.

usrmgt-server: Use new User class.

userservice: Now uses User class internally.
    get_user action now returns ISO 8601 date format, rather than a
        time tuple. (Wasn't being used).
    get_user action no longer transmits local_password (small security risk;
        note that it wasn't possible to see this for any user other than
        yourself unless admin).

ivle.util - added function object_to_dict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/publishing.py
1
 
# IVLE - Informatics Virtual Learning Environment
2
 
# Copyright (C) 2007-2009 The University of Melbourne
3
 
#
4
 
# This program is free software; you can redistribute it and/or modify
5
 
# it under the terms of the GNU General Public License as published by
6
 
# the Free Software Foundation; either version 2 of the License, or
7
 
# (at your option) any later version.
8
 
#
9
 
# This program is distributed in the hope that it will be useful,
10
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
 
# GNU General Public License for more details.
13
 
#
14
 
# You should have received a copy of the GNU General Public License
15
 
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
17
 
 
18
 
from storm.locals import Store
19
 
 
20
 
from ivle.database import Offering, ProjectSet, Project, Subject, User
21
 
 
22
 
from ivle.webapp import ApplicationRoot
23
 
from ivle.webapp.publisher import ROOT
24
 
from ivle.webapp.publisher.decorators import forward_route, reverse_route
25
 
 
26
 
@forward_route(ApplicationRoot, argc=1)
27
 
def root_to_user(root, segment):
28
 
    if not segment.startswith('~'):
29
 
        return None
30
 
    return User.get_by_login(root.store, segment[1:])
31
 
 
32
 
@forward_route(ApplicationRoot, 'subjects', argc=1)
33
 
def root_to_subject(root, name):
34
 
    return root.store.find(Subject, short_name=name).one()
35
 
 
36
 
@forward_route(Subject, argc=2)
37
 
def subject_to_offering(subject, year, semester):
38
 
    return subject.offering_for_semester(year, semester)
39
 
 
40
 
@forward_route(Offering, '+projects', argc=1)
41
 
def offering_to_project(offering, name):
42
 
    return Store.of(offering).find(Project,
43
 
                                   Project.short_name == name,
44
 
                                   Project.project_set_id == ProjectSet.id,
45
 
                                   ProjectSet.offering == offering).one()
46
 
 
47
 
@forward_route(Offering, '+projectsets', argc=1)
48
 
def offering_to_projectset(offering, name):
49
 
    try:
50
 
        ps_id = int(name)
51
 
    except ValueError:
52
 
        return None
53
 
    return Store.of(offering).find(ProjectSet,
54
 
                                   ProjectSet.id == ps_id,
55
 
                                   ProjectSet.offering == offering).one()
56
 
 
57
 
@reverse_route(User)
58
 
def user_url(user):
59
 
    return (ROOT, '~' + user.login)
60
 
 
61
 
@reverse_route(Subject)
62
 
def subject_url(subject):
63
 
    return (ROOT, ('subjects', subject.short_name))
64
 
 
65
 
@reverse_route(Offering)
66
 
def offering_url(offering):
67
 
    return (offering.subject, (offering.semester.year,
68
 
                               offering.semester.semester))
69
 
 
70
 
@reverse_route(ProjectSet)
71
 
def projectset_url(project_set):
72
 
    return (project_set.offering, ('+projectsets', str(project_set.id)))
73
 
 
74
 
@reverse_route(Project)
75
 
def project_url(project):
76
 
    return (project.project_set.offering, ('+projects', project.short_name))