author | Todd Larsen <tlarsen@google.com> |
Wed, 01 Oct 2008 07:01:06 +0000 | |
changeset 240 | dd0497f6da41 |
parent 227 | b116326abf74 |
child 241 | 0408b85de42b |
permissions | -rw-r--r-- |
31
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
1 |
# Copyright 2008 the Melange authors. |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
2 |
# |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
3 |
# Licensed under the Apache License, Version 2.0 (the "License"); |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
4 |
# you may not use this file except in compliance with the License. |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
5 |
# You may obtain a copy of the License at |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
6 |
# |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
7 |
# http://www.apache.org/licenses/LICENSE-2.0 |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
8 |
# |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
9 |
# Unless required by applicable law or agreed to in writing, software |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
10 |
# distributed under the License is distributed on an "AS IS" BASIS, |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
11 |
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
12 |
# See the License for the specific language governing permissions and |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
13 |
# limitations under the License. |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
14 |
|
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
15 |
__authors__ = [ |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
16 |
'"Augie Fackler" <durin42@gmail.com>', |
79
58001ec7720c
Home site templates and basic view.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
66
diff
changeset
|
17 |
'"Pawel Solyga" <pawel.solyga@gmail.com>', |
31
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
18 |
] |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
19 |
|
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
20 |
|
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
21 |
from django.conf.urls.defaults import * |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
22 |
|
226
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
23 |
from soc.logic import key_name |
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
24 |
|
31
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
25 |
|
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
26 |
urlpatterns = patterns( |
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
27 |
'', |
79
58001ec7720c
Home site templates and basic view.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
66
diff
changeset
|
28 |
(r'^$', 'soc.views.site.home.public'), |
141
e120c24b89e2
Added Melange front page edit view where you can change title, content, feed url. Created SiteSettings and Document models and some logic for them. Added isFeedURLValid function in soc/logic/feed.py. Created some functions for handling datastore updates of different kinds of Models (soc/logic/model.py). Fixed some typos and too long lines of code.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
132
diff
changeset
|
29 |
(r'^site/home$', 'soc.views.site.home.public'), |
e120c24b89e2
Added Melange front page edit view where you can change title, content, feed url. Created SiteSettings and Document models and some logic for them. Added isFeedURLValid function in soc/logic/feed.py. Created some functions for handling datastore updates of different kinds of Models (soc/logic/model.py). Fixed some typos and too long lines of code.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
132
diff
changeset
|
30 |
(r'^site/home/edit$', 'soc.views.site.home.edit'), |
84
1b31d238ba39
Flesh out the user/roles placeholders a little bit more.
Todd Larsen <tlarsen@google.com>
parents:
83
diff
changeset
|
31 |
|
132
15d89c284106
Add a /site/user/lookup view that provides Developers with a form to look up
Todd Larsen <tlarsen@google.com>
parents:
86
diff
changeset
|
32 |
# TODO(tlarsen): uncomment these when the view functions are committed |
84
1b31d238ba39
Flesh out the user/roles placeholders a little bit more.
Todd Larsen <tlarsen@google.com>
parents:
83
diff
changeset
|
33 |
# attempt to send User to their dashboard |
1b31d238ba39
Flesh out the user/roles placeholders a little bit more.
Todd Larsen <tlarsen@google.com>
parents:
83
diff
changeset
|
34 |
# (will display soc.views.user.roles.public() if "linkname" is not |
1b31d238ba39
Flesh out the user/roles placeholders a little bit more.
Todd Larsen <tlarsen@google.com>
parents:
83
diff
changeset
|
35 |
# current logged-in User) |
132
15d89c284106
Add a /site/user/lookup view that provides Developers with a form to look up
Todd Larsen <tlarsen@google.com>
parents:
86
diff
changeset
|
36 |
# (r'^user/roles$', |
15d89c284106
Add a /site/user/lookup view that provides Developers with a form to look up
Todd Larsen <tlarsen@google.com>
parents:
86
diff
changeset
|
37 |
# 'soc.views.user.roles.dashboard'), |
15d89c284106
Add a /site/user/lookup view that provides Developers with a form to look up
Todd Larsen <tlarsen@google.com>
parents:
86
diff
changeset
|
38 |
# (r'^user/roles/(?P<linkname>[_0-9a-z]+)$', |
15d89c284106
Add a /site/user/lookup view that provides Developers with a form to look up
Todd Larsen <tlarsen@google.com>
parents:
86
diff
changeset
|
39 |
# 'soc.views.user.roles.dashboard'), |
15d89c284106
Add a /site/user/lookup view that provides Developers with a form to look up
Todd Larsen <tlarsen@google.com>
parents:
86
diff
changeset
|
40 |
|
15d89c284106
Add a /site/user/lookup view that provides Developers with a form to look up
Todd Larsen <tlarsen@google.com>
parents:
86
diff
changeset
|
41 |
(r'^site/user/lookup$', 'soc.views.site.user.profile.lookup'), |
205
4a86df751222
Fixed not working "Create New User" view which was caused by adding key_name into User Edit Developer view. This commit divides edit() view function in soc.views.site.user.profile into edit() and create() request handlers. New create() request handler is used only in "Create New User" view and has specific form validation functions and uses updateOrCreateUserFromId() instead of updateUserForKeyName().
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
186
diff
changeset
|
42 |
(r'^site/user/profile$', 'soc.views.site.user.profile.create'), |
226
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
43 |
(r'^site/user/profile/%s$' % key_name.LINKNAME_ARG_PATTERN, |
141
e120c24b89e2
Added Melange front page edit view where you can change title, content, feed url. Created SiteSettings and Document models and some logic for them. Added isFeedURLValid function in soc/logic/feed.py. Created some functions for handling datastore updates of different kinds of Models (soc/logic/model.py). Fixed some typos and too long lines of code.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
132
diff
changeset
|
44 |
'soc.views.site.user.profile.edit'), |
186
da76f08b1752
Add Users List Developer view which is available at /site/user/list. Add User list custom templates which are used with list_helpers. Add "Users List" link in base.html template.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
170
diff
changeset
|
45 |
(r'^site/user/list$', 'soc.views.site.user.list.all'), |
226
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
46 |
|
240
dd0497f6da41
URL pattern changes that were missed by r671.
Todd Larsen <tlarsen@google.com>
parents:
227
diff
changeset
|
47 |
(r'^docs/%s$' % key_name.WORK_PATH_LINKNAME_ARGS_PATTERN, |
dd0497f6da41
URL pattern changes that were missed by r671.
Todd Larsen <tlarsen@google.com>
parents:
227
diff
changeset
|
48 |
'soc.views.docs.show.public'), |
dd0497f6da41
URL pattern changes that were missed by r671.
Todd Larsen <tlarsen@google.com>
parents:
227
diff
changeset
|
49 |
|
226
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
50 |
(r'^site/docs/edit$', 'soc.views.site.docs.edit.create'), |
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
51 |
(r'^site/docs/edit/%s$' % key_name.WORK_PATH_LINKNAME_ARGS_PATTERN, |
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
52 |
'soc.views.site.docs.edit.edit'), |
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
53 |
(r'^site/docs/list$', 'soc.views.site.docs.list.all'), |
186
da76f08b1752
Add Users List Developer view which is available at /site/user/list. Add User list custom templates which are used with list_helpers. Add "Users List" link in base.html template.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
170
diff
changeset
|
54 |
|
da76f08b1752
Add Users List Developer view which is available at /site/user/list. Add User list custom templates which are used with list_helpers. Add "Users List" link in base.html template.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
170
diff
changeset
|
55 |
# TODO(pawel.solyga): uncomment when the view functions are committed |
da76f08b1752
Add Users List Developer view which is available at /site/user/list. Add User list custom templates which are used with list_helpers. Add "Users List" link in base.html template.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
170
diff
changeset
|
56 |
#(r'^site/sponsor/profile$', 'soc.views.site.sponsor.profile.edit'), |
da76f08b1752
Add Users List Developer view which is available at /site/user/list. Add User list custom templates which are used with list_helpers. Add "Users List" link in base.html template.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
170
diff
changeset
|
57 |
#(r'^site/sponsor/list$', 'soc.views.site.sponsor.list.all'), |
da76f08b1752
Add Users List Developer view which is available at /site/user/list. Add User list custom templates which are used with list_helpers. Add "Users List" link in base.html template.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
170
diff
changeset
|
58 |
|
86
fd34dd071e5e
Fix up the URLs mapping to soc.views.user.profile.edit() and make the site base
Todd Larsen <tlarsen@google.com>
parents:
84
diff
changeset
|
59 |
(r'^user/profile$', 'soc.views.user.profile.edit'), |
226
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
60 |
(r'^user/profile/%s$' % key_name.LINKNAME_ARG_PATTERN, |
86
fd34dd071e5e
Fix up the URLs mapping to soc.views.user.profile.edit() and make the site base
Todd Larsen <tlarsen@google.com>
parents:
84
diff
changeset
|
61 |
'soc.views.user.profile.edit'), |
84
1b31d238ba39
Flesh out the user/roles placeholders a little bit more.
Todd Larsen <tlarsen@google.com>
parents:
83
diff
changeset
|
62 |
|
226
a92b11181a49
Update some of the URL patterns to get their link_name parsing from the new
Todd Larsen <tlarsen@google.com>
parents:
205
diff
changeset
|
63 |
# these are not really used... |
66
8c86470746fc
Finished migrating the "proto" app (which only contained a Person profile edit
Todd Larsen <tlarsen@google.com>
parents:
54
diff
changeset
|
64 |
(r'^org/profile/(?P<program>ghop[_0-9a-z]+)/(?P<linkname>[_0-9a-z]+)/$', |
8c86470746fc
Finished migrating the "proto" app (which only contained a Person profile edit
Todd Larsen <tlarsen@google.com>
parents:
54
diff
changeset
|
65 |
'soc.views.person.profile.edit', |
8c86470746fc
Finished migrating the "proto" app (which only contained a Person profile edit
Todd Larsen <tlarsen@google.com>
parents:
54
diff
changeset
|
66 |
{'template': 'ghop/person/profile/edit.html'}), |
8c86470746fc
Finished migrating the "proto" app (which only contained a Person profile edit
Todd Larsen <tlarsen@google.com>
parents:
54
diff
changeset
|
67 |
(r'^org/profile/(?P<program>[_0-9a-z]+)/(?P<linkname>[_0-9a-z]+)/$', |
8c86470746fc
Finished migrating the "proto" app (which only contained a Person profile edit
Todd Larsen <tlarsen@google.com>
parents:
54
diff
changeset
|
68 |
'soc.views.person.profile.edit'), |
31
8b43c541afa7
First iteration of a "prototype" Melange app, along with an initial Person
Todd Larsen <tlarsen@google.com>
parents:
diff
changeset
|
69 |
) |