author | Sverre Rabbelier <srabbelier@gmail.com> |
Sat, 22 Nov 2008 13:59:34 +0000 | |
changeset 553 | c0cc20b4afc9 |
parent 552 | cb23b3897e0c |
child 554 | 68c7a1dd3c52 |
permissions | -rw-r--r-- |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
1 |
#!/usr/bin/python2.5 |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
2 |
# |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
3 |
# Copyright 2008 the Melange authors. |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
4 |
# |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
5 |
# Licensed under the Apache License, Version 2.0 (the "License"); |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
6 |
# you may not use this file except in compliance with the License. |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
7 |
# You may obtain a copy of the License at |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
8 |
# |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
9 |
# http://www.apache.org/licenses/LICENSE-2.0 |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
10 |
# |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
11 |
# Unless required by applicable law or agreed to in writing, software |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
12 |
# distributed under the License is distributed on an "AS IS" BASIS, |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
13 |
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
14 |
# See the License for the specific language governing permissions and |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
15 |
# limitations under the License. |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
16 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
17 |
"""Helpers functions for displaying views. |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
18 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
19 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
20 |
__authors__ = [ |
429
e50e18936f06
Fixed typo in e-mail address
Sverre Rabbelier <srabbelier@gmail.com>
parents:
428
diff
changeset
|
21 |
'"Sverre Rabbelier" <sverre@rabbelier.nl>', |
516
ec1dcd70b97e
The list method in models/base.py can now use a filter to make a selection of entities to show.
Lennard de Rijk <ljvderijk@gmail.com>
parents:
514
diff
changeset
|
22 |
'"Lennard de Rijk" <ljvderijk@gmail.com>', |
471
dcb1f7821b39
Remove stop parameter from home_settings and site_settings views. This is something Sverre didn't mean to commit :-) Add missing params description to the models Base class docs.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
459
diff
changeset
|
23 |
'"Pawel Solyga" <pawel.solyga@gmail.com>', |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
24 |
] |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
25 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
26 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
27 |
from django import http |
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
28 |
from django.conf.urls import defaults |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
29 |
from django.utils.translation import ugettext_lazy |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
30 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
31 |
import soc.logic |
539
e30462354e26
Allow for multiple list objects
Sverre Rabbelier <srabbelier@gmail.com>
parents:
537
diff
changeset
|
32 |
import soc.logic.lists |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
33 |
import soc.views.helper.lists |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
34 |
import soc.views.helper.responses |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
35 |
|
387
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
36 |
from soc.logic import dicts |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
37 |
from soc.logic import models |
533
ba3309b2fd30
Move LINK_ID and SCOPE_PATH regular expressions to soc/models/linkable.py.
Todd Larsen <tlarsen@google.com>
parents:
528
diff
changeset
|
38 |
from soc.models import linkable |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
39 |
from soc.views import helper |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
40 |
from soc.views import out_of_band |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
41 |
from soc.views.helper import access |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
42 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
43 |
|
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
44 |
class View(object): |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
45 |
"""Views for entity classes. |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
46 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
47 |
The View class functions specific to Entity classes by relying |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
48 |
on the the child-classes to define the following fields: |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
49 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
50 |
self._logic: the logic singleton for this entity |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
51 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
52 |
|
387
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
53 |
DEF_SUBMIT_MSG_PARAM_NAME = 's' |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
54 |
DEF_SUBMIT_MSG_PROFILE_SAVED = 0 |
387
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
55 |
|
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
56 |
DEF_CREATE_NEW_ENTITY_MSG_FMT = ugettext_lazy( |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
57 |
' You can create a new %(entity_type)s by visiting' |
387
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
58 |
' <a href="%(create)s">Create ' |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
59 |
'a New %(entity_type)s</a> page.') |
387
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
60 |
|
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
61 |
def __init__(self, params=None): |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
62 |
""" |
373
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
63 |
|
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
64 |
Args: |
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
65 |
params: This dictionary should be filled with the parameters |
387
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
66 |
specific to this entity, required fields are: |
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
67 |
rights: This dictionary should be filled with the access check |
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
68 |
functions that should be called |
387
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
69 |
name: the name of the entity (names should have sentence-style caps) |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
70 |
name_short: the short form name of the name ('org' vs 'organization') |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
71 |
name_plural: the plural form of the name |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
72 |
url_name: the name of the entity used in urls |
387
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
73 |
edit_form: the class of the Django form to be used when editing |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
74 |
create_form: the class of the Django form to be used when creating |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
75 |
edit_template: the Django template to be used for editing |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
76 |
public_template: the Django template to be used as public page |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
77 |
list_template: the Django template to be used as list page |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
78 |
lists_template: the Django templates to search for the list page |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
79 |
delete_redirect: the Django template to redirect to on delete |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
80 |
create_redirect: the Django template to redirect to after creation |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
81 |
save_message: the message to display when the entity is saved |
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
82 |
edit_params: the params to use when editing |
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
83 |
sidebar: the sidebar menu items for this view |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
84 |
sidebar_defaults: a dictionary with defaults for the sidebar; each |
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
85 |
value in the dict is a two-tuple: |
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
86 |
(url_format, # supplied a single positional url_name |
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
87 |
menu_text_format) # supplied the params dict |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
88 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
89 |
|
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
90 |
rights = {} |
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
91 |
rights['unspecified'] = [] |
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
92 |
rights['any_access'] = [access.checkIsUser] |
551
2ee7ad5266a8
Define a default for rights['public'] in views/models/base.py. Alter rights
Todd Larsen <tlarsen@google.com>
parents:
548
diff
changeset
|
93 |
rights['public'] = [access.checkIsUser] |
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
94 |
rights['create'] = [access.checkIsDeveloper] |
509
e8acc0a907fb
Adds the rights['edit'] to models/base.py wich was left out in r1049.
Lennard de Rijk <ljvderijk@gmail.com>
parents:
507
diff
changeset
|
95 |
rights['edit'] = [access.checkIsDeveloper] |
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
96 |
rights['delete'] = [access.checkIsDeveloper] |
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
97 |
rights['list'] = [access.checkIsDeveloper] |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
98 |
|
492
4abdeedfc08e
Fixed redirection after creation to Just Work
Sverre Rabbelier <srabbelier@gmail.com>
parents:
490
diff
changeset
|
99 |
new_params = {} |
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
100 |
new_params['rights'] = rights |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
101 |
new_params['create_redirect'] = '/%s' % params['url_name'] |
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
102 |
new_params['missing_redirect'] = '/%s/create' % params['url_name'] |
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
103 |
|
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
104 |
new_params['sidebar'] = None |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
105 |
new_params['sidebar_defaults'] = [ |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
106 |
('/%s/create', 'New %(name)s'), |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
107 |
('/%s/list', 'List %(name_plural)s'), |
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
108 |
] |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
109 |
new_params['sidebar_additional'] = [] |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
110 |
new_params['sidebar_heading'] = None |
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
111 |
|
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
112 |
new_params['key_fields_prefix'] = [] |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
113 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
114 |
new_params['django_patterns'] = None |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
115 |
new_params['django_patterns_defaults'] = [ |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
116 |
(r'^%(url_name)s/show/%(key_fields)s$', |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
117 |
'soc.views.models.%s.public', 'Show %(name_short)s'), |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
118 |
(r'^%(url_name)s/create$', |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
119 |
'soc.views.models.%s.create', 'Create %(name_short)s'), |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
120 |
(r'^%(url_name)s/create/%(key_fields)s$', |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
121 |
'soc.views.models.%s.create', 'Create %(name_short)s'), |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
122 |
(r'^%(url_name)s/delete/%(key_fields)s$', |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
123 |
'soc.views.models.%s.delete', 'Delete %(name_short)s'), |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
124 |
(r'^%(url_name)s/edit/%(key_fields)s$', |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
125 |
'soc.views.models.%s.edit', 'Edit %(name_short)s'), |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
126 |
(r'^%(url_name)s/list$', |
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
127 |
'soc.views.models.%s.list', 'List %(name_plural)s'), |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
128 |
] |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
129 |
|
553
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
130 |
new_params['edit_template'] = 'soc/models/edit.html' |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
131 |
new_params['list_template'] = 'soc/models/list.html' |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
132 |
new_params['invite_template'] = 'soc/models/invite.html' |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
133 |
|
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
134 |
new_params['list_main'] = 'soc/list/list_main.html' |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
135 |
new_params['list_pagination'] = 'soc/list/list_pagination.html' |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
136 |
|
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
137 |
new_params['list_action'] = '/' + params['url_name'] + '/edit' |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
138 |
new_params['list_params'] = { |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
139 |
'list_action': 'action', |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
140 |
'list_description': 'description', |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
141 |
'list_main': 'main', |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
142 |
'list_pagination': 'pagination', |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
143 |
'list_row': 'row', |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
144 |
'list_heading': 'heading', |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
145 |
} |
495
87afae6e4c51
Added basic 'invite' functionality
Sverre Rabbelier <srabbelier@gmail.com>
parents:
494
diff
changeset
|
146 |
|
539
e30462354e26
Allow for multiple list objects
Sverre Rabbelier <srabbelier@gmail.com>
parents:
537
diff
changeset
|
147 |
description = ugettext_lazy('List of %(name)s in Google Open Source Programs.') |
e30462354e26
Allow for multiple list objects
Sverre Rabbelier <srabbelier@gmail.com>
parents:
537
diff
changeset
|
148 |
new_params['list_description'] = description % params |
514
55bd39dab49c
Move saved message to the base class
Sverre Rabbelier <srabbelier@gmail.com>
parents:
512
diff
changeset
|
149 |
new_params['save_message'] = [ugettext_lazy('Profile saved.')] |
55bd39dab49c
Move saved message to the base class
Sverre Rabbelier <srabbelier@gmail.com>
parents:
512
diff
changeset
|
150 |
new_params['edit_params'] = { |
55bd39dab49c
Move saved message to the base class
Sverre Rabbelier <srabbelier@gmail.com>
parents:
512
diff
changeset
|
151 |
self.DEF_SUBMIT_MSG_PARAM_NAME: self.DEF_SUBMIT_MSG_PROFILE_SAVED, |
55bd39dab49c
Move saved message to the base class
Sverre Rabbelier <srabbelier@gmail.com>
parents:
512
diff
changeset
|
152 |
} |
55bd39dab49c
Move saved message to the base class
Sverre Rabbelier <srabbelier@gmail.com>
parents:
512
diff
changeset
|
153 |
|
492
4abdeedfc08e
Fixed redirection after creation to Just Work
Sverre Rabbelier <srabbelier@gmail.com>
parents:
490
diff
changeset
|
154 |
self._params = dicts.merge(params, new_params) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
155 |
|
482
839740b061ad
Factor out direct use of the page object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
471
diff
changeset
|
156 |
def public(self, request, page_name=None, params=None, **kwargs): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
157 |
"""Displays the public page for the entity specified by **kwargs. |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
158 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
159 |
Args: |
373
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
160 |
request: the standard Django HTTP request object |
500
44ea4620c5c0
Replace old page parameter doc string description with new one for page_name.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
499
diff
changeset
|
161 |
page_name: the page name displayed in templates as page and header title |
471
dcb1f7821b39
Remove stop parameter from home_settings and site_settings views. This is something Sverre didn't mean to commit :-) Add missing params description to the models Base class docs.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
459
diff
changeset
|
162 |
params: a dict with params for this View |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
163 |
kwargs: the Key Fields for the specified entity |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
164 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
165 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
166 |
params = dicts.merge(params, self._params) |
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
167 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
168 |
try: |
428
e0d5de282004
Fixed typo in access check
Sverre Rabbelier <srabbelier@gmail.com>
parents:
418
diff
changeset
|
169 |
self.checkAccess('public', request) |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
170 |
except out_of_band.Error, error: |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
171 |
return error.response(request) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
172 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
173 |
# create default template context for use with any templates |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
174 |
context = helper.responses.getUniversalContext(request) |
482
839740b061ad
Factor out direct use of the page object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
471
diff
changeset
|
175 |
context['page_name'] = page_name |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
176 |
entity = None |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
177 |
|
446
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
178 |
if not all(kwargs.values()): |
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
179 |
#TODO: Change this into a proper redirect |
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
180 |
return http.HttpResponseRedirect('/') |
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
181 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
182 |
try: |
435
829fe8302a8b
Refactor out the abundance of dictionary (un)packing
Sverre Rabbelier <srabbelier@gmail.com>
parents:
429
diff
changeset
|
183 |
key_fields = self._logic.getKeyFieldsFromDict(kwargs) |
829fe8302a8b
Refactor out the abundance of dictionary (un)packing
Sverre Rabbelier <srabbelier@gmail.com>
parents:
429
diff
changeset
|
184 |
entity = self._logic.getIfFields(key_fields) |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
185 |
except out_of_band.Error, error: |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
186 |
return error.response(request, template=params['public_template'], |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
187 |
context=context) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
188 |
|
446
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
189 |
self._public(request, entity, context) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
190 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
191 |
context['entity'] = entity |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
192 |
context['entity_type'] = params['name'] |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
193 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
194 |
template = params['public_template'] |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
195 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
196 |
return helper.responses.respond(request, template, context) |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
197 |
|
482
839740b061ad
Factor out direct use of the page object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
471
diff
changeset
|
198 |
def create(self, request, page_name=None, params=None, **kwargs): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
199 |
"""Displays the create page for this entity type. |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
200 |
|
373
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
201 |
Args: |
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
202 |
request: the standard Django HTTP request object |
500
44ea4620c5c0
Replace old page parameter doc string description with new one for page_name.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
499
diff
changeset
|
203 |
page_name: the page name displayed in templates as page and header title |
471
dcb1f7821b39
Remove stop parameter from home_settings and site_settings views. This is something Sverre didn't mean to commit :-) Add missing params description to the models Base class docs.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
459
diff
changeset
|
204 |
params: a dict with params for this View |
373
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
205 |
kwargs: not used for create() |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
206 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
207 |
|
492
4abdeedfc08e
Fixed redirection after creation to Just Work
Sverre Rabbelier <srabbelier@gmail.com>
parents:
490
diff
changeset
|
208 |
params = dicts.merge(params, self._params) |
4abdeedfc08e
Fixed redirection after creation to Just Work
Sverre Rabbelier <srabbelier@gmail.com>
parents:
490
diff
changeset
|
209 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
210 |
# Create page is an edit page with no key fields |
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
211 |
empty_kwargs = {} |
410
2af7f84f4fc7
Moved all key_name related things to the logic modules
Sverre Rabbelier <srabbelier@gmail.com>
parents:
409
diff
changeset
|
212 |
fields = self._logic.getKeyFieldNames() |
2af7f84f4fc7
Moved all key_name related things to the logic modules
Sverre Rabbelier <srabbelier@gmail.com>
parents:
409
diff
changeset
|
213 |
for field in fields: |
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
214 |
empty_kwargs[field] = None |
410
2af7f84f4fc7
Moved all key_name related things to the logic modules
Sverre Rabbelier <srabbelier@gmail.com>
parents:
409
diff
changeset
|
215 |
|
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
216 |
if not kwargs: |
537
f2bd9c465a6d
Fix getKeyValues() method footprint mismatches in soc.logic.models.site.Logic
Todd Larsen <tlarsen@google.com>
parents:
533
diff
changeset
|
217 |
return self.edit(request, page_name=page_name, params=params, |
f2bd9c465a6d
Fix getKeyValues() method footprint mismatches in soc.logic.models.site.Logic
Todd Larsen <tlarsen@google.com>
parents:
533
diff
changeset
|
218 |
**empty_kwargs) |
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
219 |
else: |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
220 |
return self.edit(request, page_name=page_name, params=params, |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
221 |
seed=kwargs, **empty_kwargs) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
222 |
|
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
223 |
def edit(self, request, page_name=None, params=None, seed=None, **kwargs): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
224 |
"""Displays the edit page for the entity specified by **kwargs. |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
225 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
226 |
Args: |
373
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
227 |
request: the standard Django HTTP request object |
500
44ea4620c5c0
Replace old page parameter doc string description with new one for page_name.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
499
diff
changeset
|
228 |
page_name: the page name displayed in templates as page and header title |
471
dcb1f7821b39
Remove stop parameter from home_settings and site_settings views. This is something Sverre didn't mean to commit :-) Add missing params description to the models Base class docs.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
459
diff
changeset
|
229 |
params: a dict with params for this View |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
230 |
kwargs: The Key Fields for the specified entity |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
231 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
232 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
233 |
params = dicts.merge(params, self._params) |
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
234 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
235 |
try: |
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
236 |
self.checkAccess('edit', request, rights=params['rights']) |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
237 |
except out_of_band.Error, error: |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
238 |
return error.response(request) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
239 |
|
373
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
240 |
context = helper.responses.getUniversalContext(request) |
482
839740b061ad
Factor out direct use of the page object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
471
diff
changeset
|
241 |
context['page_name'] = page_name |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
242 |
entity = None |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
243 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
244 |
try: |
439
0658c3c9a9dc
Minor fixes needed for generic key name
Sverre Rabbelier <srabbelier@gmail.com>
parents:
438
diff
changeset
|
245 |
if all(kwargs.values()): |
0658c3c9a9dc
Minor fixes needed for generic key name
Sverre Rabbelier <srabbelier@gmail.com>
parents:
438
diff
changeset
|
246 |
key_fields = self._logic.getKeyFieldsFromDict(kwargs) |
0658c3c9a9dc
Minor fixes needed for generic key name
Sverre Rabbelier <srabbelier@gmail.com>
parents:
438
diff
changeset
|
247 |
entity = self._logic.getIfFields(key_fields) |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
248 |
except out_of_band.Error, error: |
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
249 |
if not seed: |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
250 |
error.message_fmt = ( |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
251 |
error.message_fmt + self.DEF_CREATE_NEW_ENTITY_MSG_FMT % { |
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
252 |
'entity_type_lower' : params['name'].lower(), |
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
253 |
'entity_type' : params['name'], |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
254 |
'create' : params['missing_redirect']}) |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
255 |
return error.response(request, template=params['public_template'], |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
256 |
context=context) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
257 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
258 |
if request.method == 'POST': |
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
259 |
return self.editPost(request, entity, context, params) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
260 |
else: |
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
261 |
return self.editGet(request, entity, context, seed, params) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
262 |
|
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
263 |
def editPost(self, request, entity, context, params): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
264 |
"""Same as edit, but on POST. |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
265 |
""" |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
266 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
267 |
params = dicts.merge(params, self._params) |
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
268 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
269 |
if entity: |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
270 |
form = params['edit_form'](request.POST) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
271 |
else: |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
272 |
form = params['create_form'](request.POST) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
273 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
274 |
if not form.is_valid(): |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
275 |
return self._constructResponse(request, entity, context, form, params) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
276 |
|
459
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
277 |
key_name, fields = self.collectCleanedFields(form) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
278 |
|
442
92c17629af0e
Fix wrong redirect when changing partial path or link name. Remove an unnecessary assignment in logic/models/base.py that would generate an error when an entity did not exist.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
439
diff
changeset
|
279 |
# get the old_suffix before editing |
548
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
280 |
if entity: |
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
281 |
old_suffix = '%s%s' %('edit/', self._logic.getKeySuffix(entity)) |
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
282 |
else: |
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
283 |
# retrieve the suffix appened to the create path |
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
284 |
splitted_path = request.path.split('/create/',1) |
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
285 |
if len(splitted_path) == 2 : |
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
286 |
old_suffix = '%s%s' %('create/', splitted_path[1]) |
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
287 |
else: |
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
288 |
# no suffix after the create in the request path |
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
289 |
old_suffix = 'create' |
442
92c17629af0e
Fix wrong redirect when changing partial path or link name. Remove an unnecessary assignment in logic/models/base.py that would generate an error when an entity did not exist.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
439
diff
changeset
|
290 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
291 |
self._editPost(request, entity, fields) |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
292 |
|
459
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
293 |
if not key_name: |
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
294 |
key_fields = self._logic.getKeyFieldsFromDict(fields) |
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
295 |
key_name = self._logic.getKeyNameForFields(key_fields) |
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
296 |
|
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
297 |
entity = self._logic.updateOrCreateFromKeyName(fields, key_name) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
298 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
299 |
if not entity: |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
300 |
return http.HttpResponseRedirect('/') |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
301 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
302 |
page_params = params['edit_params'] |
548
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
303 |
new_suffix = '%s%s' %('edit/', self._logic.getKeySuffix(entity)) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
304 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
305 |
# redirect to (possibly new) location of the entity |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
306 |
# (causes 'Profile saved' message to be displayed) |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
307 |
return helper.responses.redirectToChangedSuffix( |
548
2ceb3b14349c
Fix for 404 occuring when signing out during the creation of, for example,
Todd Larsen <tlarsen@google.com>
parents:
543
diff
changeset
|
308 |
request, old_suffix, new_suffix, |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
309 |
params=page_params) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
310 |
|
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
311 |
def editGet(self, request, entity, context, seed, params): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
312 |
"""Same as edit, but on GET. |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
313 |
""" |
403
d3e545a8bd26
Some more improvements to the generic view code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
402
diff
changeset
|
314 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
315 |
params = dicts.merge(params, self._params) |
410
2af7f84f4fc7
Moved all key_name related things to the logic modules
Sverre Rabbelier <srabbelier@gmail.com>
parents:
409
diff
changeset
|
316 |
suffix = self._logic.getKeySuffix(entity) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
317 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
318 |
# Remove the params from the request, this is relevant only if |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
319 |
# someone bookmarked a POST page. |
387
c55195361cb6
Addressed comments by Todd on r822
Sverre Rabbelier <srabbelier@gmail.com>
parents:
373
diff
changeset
|
320 |
is_self_referrer = helper.requests.isReferrerSelf(request, suffix=suffix) |
402
021e86368600
Incorperated suggestions by Todd
Sverre Rabbelier <srabbelier@gmail.com>
parents:
399
diff
changeset
|
321 |
if request.GET.get(self.DEF_SUBMIT_MSG_PARAM_NAME): |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
322 |
if (not entity) or (not is_self_referrer): |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
323 |
return http.HttpResponseRedirect(request.path) |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
324 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
325 |
if entity: |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
326 |
# Note: no message will be displayed if parameter is not present |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
327 |
context['notice'] = helper.requests.getSingleIndexedParamValue( |
402
021e86368600
Incorperated suggestions by Todd
Sverre Rabbelier <srabbelier@gmail.com>
parents:
399
diff
changeset
|
328 |
request, self.DEF_SUBMIT_MSG_PARAM_NAME, |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
329 |
values=params['save_message']) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
330 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
331 |
# populate form with the existing entity |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
332 |
form = params['edit_form'](instance=entity) |
459
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
333 |
if 'key_name' in form.fields: |
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
334 |
form.fields['key_name'].initial = entity.key().name() |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
335 |
self._editGet(request, entity, form) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
336 |
else: |
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
337 |
if seed: |
495
87afae6e4c51
Added basic 'invite' functionality
Sverre Rabbelier <srabbelier@gmail.com>
parents:
494
diff
changeset
|
338 |
self._editSeed(request, seed) |
490
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
339 |
form = params['create_form'](initial=seed) |
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
340 |
else: |
7cfa2ad62944
Allow pre-seeding a create form
Sverre Rabbelier <srabbelier@gmail.com>
parents:
482
diff
changeset
|
341 |
form = params['create_form']() |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
342 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
343 |
return self._constructResponse(request, entity, context, form, params) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
344 |
|
516
ec1dcd70b97e
The list method in models/base.py can now use a filter to make a selection of entities to show.
Lennard de Rijk <ljvderijk@gmail.com>
parents:
514
diff
changeset
|
345 |
def list(self, request, page_name=None, params=None, filter=None): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
346 |
"""Displays the list page for the entity type. |
373
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
347 |
|
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
348 |
Args: |
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
349 |
request: the standard Django HTTP request object |
500
44ea4620c5c0
Replace old page parameter doc string description with new one for page_name.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
499
diff
changeset
|
350 |
page_name: the page name displayed in templates as page and header title |
471
dcb1f7821b39
Remove stop parameter from home_settings and site_settings views. This is something Sverre didn't mean to commit :-) Add missing params description to the models Base class docs.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
459
diff
changeset
|
351 |
params: a dict with params for this View |
516
ec1dcd70b97e
The list method in models/base.py can now use a filter to make a selection of entities to show.
Lennard de Rijk <ljvderijk@gmail.com>
parents:
514
diff
changeset
|
352 |
filter: a dict for the properties that the entities should have |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
353 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
354 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
355 |
params = dicts.merge(params, self._params) |
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
356 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
357 |
try: |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
358 |
self.checkAccess('list', request) |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
359 |
except out_of_band.Error, error: |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
360 |
return error.response(request) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
361 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
362 |
context = helper.responses.getUniversalContext(request) |
482
839740b061ad
Factor out direct use of the page object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
471
diff
changeset
|
363 |
context['page_name'] = page_name |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
364 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
365 |
offset, limit = helper.lists.cleanListParameters( |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
366 |
offset=request.GET.get('offset'), limit=request.GET.get('limit')) |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
367 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
368 |
# Fetch one more to see if there should be a 'next' link |
516
ec1dcd70b97e
The list method in models/base.py can now use a filter to make a selection of entities to show.
Lennard de Rijk <ljvderijk@gmail.com>
parents:
514
diff
changeset
|
369 |
if not filter: |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
370 |
entities = self._logic.getForLimitAndOffset(limit+1, offset=offset) |
516
ec1dcd70b97e
The list method in models/base.py can now use a filter to make a selection of entities to show.
Lennard de Rijk <ljvderijk@gmail.com>
parents:
514
diff
changeset
|
371 |
else: |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
372 |
entities = self._logic.getForFields(filter, limit=limit+1, offset=offset) |
516
ec1dcd70b97e
The list method in models/base.py can now use a filter to make a selection of entities to show.
Lennard de Rijk <ljvderijk@gmail.com>
parents:
514
diff
changeset
|
373 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
374 |
context['pagination_form'] = helper.lists.makePaginationForm(request, limit) |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
375 |
|
553
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
376 |
updates = dicts.rename(params, params['list_params']) |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
377 |
updates['logic'] = self._logic |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
378 |
|
553
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
379 |
content = helper.lists.getList(request, entities, offset, limit) |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
380 |
content.update(updates) |
c0cc20b4afc9
Make redirect generic using the new Lists object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
552
diff
changeset
|
381 |
|
539
e30462354e26
Allow for multiple list objects
Sverre Rabbelier <srabbelier@gmail.com>
parents:
537
diff
changeset
|
382 |
context['list'] = soc.logic.lists.Lists([content]) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
383 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
384 |
context['entity_type'] = params['name'] |
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
385 |
context['entity_type_plural'] = params['name_plural'] |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
386 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
387 |
template = params['list_template'] |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
388 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
389 |
return helper.responses.respond(request, template, context) |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
390 |
|
482
839740b061ad
Factor out direct use of the page object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
471
diff
changeset
|
391 |
def delete(self, request, page_name=None, params=None, **kwargs): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
392 |
"""Shows the delete page for the entity specified by **kwargs. |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
393 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
394 |
Args: |
373
dcd7013ae0d5
Add the Page object to the context of each view method. Also, add some missing
Todd Larsen <tlarsen@google.com>
parents:
363
diff
changeset
|
395 |
request: the standard Django HTTP request object |
500
44ea4620c5c0
Replace old page parameter doc string description with new one for page_name.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
499
diff
changeset
|
396 |
page_name: the page name displayed in templates as page and header title |
471
dcb1f7821b39
Remove stop parameter from home_settings and site_settings views. This is something Sverre didn't mean to commit :-) Add missing params description to the models Base class docs.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
459
diff
changeset
|
397 |
params: a dict with params for this View |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
398 |
kwargs: The Key Fields for the specified entity |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
399 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
400 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
401 |
params = dicts.merge(params, self._params) |
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
402 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
403 |
try: |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
404 |
self.checkAccess('delete', request) |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
405 |
except out_of_band.Error, error: |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
406 |
return error.response(request) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
407 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
408 |
# create default template context for use with any templates |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
409 |
context = helper.responses.getUniversalContext(request) |
482
839740b061ad
Factor out direct use of the page object
Sverre Rabbelier <srabbelier@gmail.com>
parents:
471
diff
changeset
|
410 |
context['page_name'] = page_name |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
411 |
entity = None |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
412 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
413 |
try: |
438
af082c92ddda
Quick fix to fix user profile creation
Sverre Rabbelier <srabbelier@gmail.com>
parents:
435
diff
changeset
|
414 |
key_fields = self._logic.getKeyFieldsFromDict(kwargs) |
435
829fe8302a8b
Refactor out the abundance of dictionary (un)packing
Sverre Rabbelier <srabbelier@gmail.com>
parents:
429
diff
changeset
|
415 |
entity = self._logic.getIfFields(key_fields) |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
416 |
except out_of_band.Error, error: |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
417 |
error.message_fmt = ( |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
418 |
error.message_fmt + self.DEF_CREATE_NEW_ENTITY_MSG_FMT % { |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
419 |
'entity_type_lower' : params['name'].lower(), |
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
420 |
'entity_type' : params['name'], |
543
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
421 |
'create' : params['missing_redirect']}) |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
422 |
return error.response(request, template=params['edit_template'], |
280a1ac6bcc1
Merge soc/logic/out_of_band.py into soc/views/out_of_band.py. Merge
Todd Larsen <tlarsen@google.com>
parents:
542
diff
changeset
|
423 |
context=context) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
424 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
425 |
if not entity: |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
426 |
#TODO: Create a proper error page for this |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
427 |
return http.HttpResponseRedirect('/') |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
428 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
429 |
if not self._logic.isDeletable(entity): |
389
9b873166d7d5
Fix identions, too long lines, unused imports and some other mistakes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
387
diff
changeset
|
430 |
# TODO: Update the notice area telling the user that they |
9b873166d7d5
Fix identions, too long lines, unused imports and some other mistakes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
387
diff
changeset
|
431 |
# can't delete the entity |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
432 |
pass |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
433 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
434 |
self._logic.delete(entity) |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
435 |
redirect = params['delete_redirect'] |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
436 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
437 |
return http.HttpResponseRedirect(redirect) |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
438 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
439 |
def _editPost(self, request, entity, fields): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
440 |
"""Performs any required processing on the entity to post its edit page. |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
441 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
442 |
Args: |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
443 |
request: the django request object |
402
021e86368600
Incorperated suggestions by Todd
Sverre Rabbelier <srabbelier@gmail.com>
parents:
399
diff
changeset
|
444 |
entity: the entity to create or update from POST contents |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
445 |
fields: the new field values |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
446 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
447 |
|
446
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
448 |
pass |
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
449 |
|
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
450 |
def _public(self, request, entity, context): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
451 |
"""Performs any required processing to get an entities public page. |
446
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
452 |
|
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
453 |
Args: |
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
454 |
request: the django request object |
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
455 |
entity: the entity to make public |
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
456 |
context: the context object |
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
457 |
""" |
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
458 |
|
0b479d573a4c
Refactoring of {site/home}_settings to make them use base.View
Sverre Rabbelier <srabbelier@gmail.com>
parents:
445
diff
changeset
|
459 |
pass |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
460 |
|
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
461 |
def _editGet(self, request, entity, form): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
462 |
"""Performs any required processing on the form to get its edit page. |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
463 |
|
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
464 |
Args: |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
465 |
request: the django request object |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
466 |
entity: the entity to get |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
467 |
form: the django form that will be used for the page |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
468 |
""" |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
469 |
|
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
470 |
pass |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
471 |
|
497
73666a7cd718
Added a default _editSeed method
Sverre Rabbelier <srabbelier@gmail.com>
parents:
495
diff
changeset
|
472 |
def _editSeed(self, request, seed): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
473 |
"""Performs any required processing on the form to get its edit page. |
497
73666a7cd718
Added a default _editSeed method
Sverre Rabbelier <srabbelier@gmail.com>
parents:
495
diff
changeset
|
474 |
|
73666a7cd718
Added a default _editSeed method
Sverre Rabbelier <srabbelier@gmail.com>
parents:
495
diff
changeset
|
475 |
Args: |
73666a7cd718
Added a default _editSeed method
Sverre Rabbelier <srabbelier@gmail.com>
parents:
495
diff
changeset
|
476 |
request: the django request object |
73666a7cd718
Added a default _editSeed method
Sverre Rabbelier <srabbelier@gmail.com>
parents:
495
diff
changeset
|
477 |
seed: the fields to seed the create page with |
73666a7cd718
Added a default _editSeed method
Sverre Rabbelier <srabbelier@gmail.com>
parents:
495
diff
changeset
|
478 |
""" |
73666a7cd718
Added a default _editSeed method
Sverre Rabbelier <srabbelier@gmail.com>
parents:
495
diff
changeset
|
479 |
|
73666a7cd718
Added a default _editSeed method
Sverre Rabbelier <srabbelier@gmail.com>
parents:
495
diff
changeset
|
480 |
pass |
73666a7cd718
Added a default _editSeed method
Sverre Rabbelier <srabbelier@gmail.com>
parents:
495
diff
changeset
|
481 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
482 |
def _constructResponse(self, request, entity, context, form, params): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
483 |
"""Updates the context and returns a response for the specified arguments. |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
484 |
|
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
485 |
Args: |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
486 |
request: the django request object |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
487 |
entity: the entity that is used |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
488 |
context: the context to be used |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
489 |
form: the form that will be used |
471
dcb1f7821b39
Remove stop parameter from home_settings and site_settings views. This is something Sverre didn't mean to commit :-) Add missing params description to the models Base class docs.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
459
diff
changeset
|
490 |
params: a dict with params for this View |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
491 |
""" |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
492 |
|
410
2af7f84f4fc7
Moved all key_name related things to the logic modules
Sverre Rabbelier <srabbelier@gmail.com>
parents:
409
diff
changeset
|
493 |
suffix = self._logic.getKeySuffix(entity) |
403
d3e545a8bd26
Some more improvements to the generic view code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
402
diff
changeset
|
494 |
|
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
495 |
context['form'] = form |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
496 |
context['entity'] = entity |
403
d3e545a8bd26
Some more improvements to the generic view code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
402
diff
changeset
|
497 |
context['entity_suffix'] = suffix |
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
498 |
context['entity_type'] = params['name'] |
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
499 |
context['entity_type_plural'] = params['name_plural'] |
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
500 |
context['entity_type_short'] = params['name_short'] |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
501 |
context['entity_type_url'] = params['url_name'] |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
502 |
|
455
4d98832b43ba
Added support for providing a custom params dict
Sverre Rabbelier <srabbelier@gmail.com>
parents:
446
diff
changeset
|
503 |
template = params['edit_template'] |
399
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
504 |
|
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
505 |
return helper.responses.respond(request, template, context) |
b82852e6963e
Various improvements to the generic View code
Sverre Rabbelier <srabbelier@gmail.com>
parents:
389
diff
changeset
|
506 |
|
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
507 |
def checkAccess(self, access_type, request, rights=None): |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
508 |
"""Runs all the defined checks for the specified type |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
509 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
510 |
Args: |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
511 |
access_type: the type of request (such as 'list' or 'edit') |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
512 |
request: the Django request object |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
513 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
514 |
Returns: |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
515 |
True: If all the required access checks have been made successfully |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
516 |
False: If a check failed, in this case self._response will contain |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
517 |
the response provided by the failed access check. |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
518 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
519 |
|
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
520 |
rights = dicts.merge(rights, self._params['rights']) |
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
521 |
|
418
e035f31d131e
Always check if a user filled in a user profile
Sverre Rabbelier <srabbelier@gmail.com>
parents:
410
diff
changeset
|
522 |
# Call each access checker |
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
523 |
for check in rights['any_access']: |
418
e035f31d131e
Always check if a user filled in a user profile
Sverre Rabbelier <srabbelier@gmail.com>
parents:
410
diff
changeset
|
524 |
check(request) |
e035f31d131e
Always check if a user filled in a user profile
Sverre Rabbelier <srabbelier@gmail.com>
parents:
410
diff
changeset
|
525 |
|
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
526 |
if access_type not in rights: |
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
527 |
for check in rights['unspecified']: |
528
5e6ae12cc495
Some indention and too long lines fixes in soc.views.models.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
518
diff
changeset
|
528 |
# No checks defined, so do the 'generic check' and bail out |
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
529 |
check(request, access_type) |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
530 |
return |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
531 |
|
507
3603fdafabf7
Fold the _rights dictionary into params
Sverre Rabbelier <srabbelier@gmail.com>
parents:
502
diff
changeset
|
532 |
for check in rights[access_type]: |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
533 |
check(request) |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
534 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
535 |
def collectCleanedFields(self, form): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
536 |
"""Collects all cleaned fields and returns them with the key_name. |
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
537 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
538 |
Args: |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
539 |
form: The form from which the cleaned fields should be collected |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
540 |
""" |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
541 |
|
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
542 |
fields = {} |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
543 |
|
459
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
544 |
key_name = None |
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
545 |
if 'key_name' in form.cleaned_data: |
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
546 |
key_name = form.cleaned_data.pop('key_name') |
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
547 |
|
363
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
548 |
for field, value in form.cleaned_data.iteritems(): |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
549 |
fields[field] = value |
d35ffa6ca643
Add a framework for generic views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
diff
changeset
|
550 |
|
459
2cfcedaf7c16
Preparation for generic user views
Sverre Rabbelier <srabbelier@gmail.com>
parents:
458
diff
changeset
|
551 |
return key_name, fields |
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
552 |
|
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
553 |
def getKeyFieldsPattern(self, params): |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
554 |
""" |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
555 |
""" |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
556 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
557 |
names = self._logic.getKeyFieldNames() |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
558 |
patterns = params['key_fields_prefix'] |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
559 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
560 |
for name in names: |
533
ba3309b2fd30
Move LINK_ID and SCOPE_PATH regular expressions to soc/models/linkable.py.
Todd Larsen <tlarsen@google.com>
parents:
528
diff
changeset
|
561 |
pattern = r'(?P<%s>%s)' % (name, linkable.LINK_ID_PATTERN_CORE) |
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
562 |
patterns.append(pattern) |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
563 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
564 |
result = '/'.join(patterns) |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
565 |
return result |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
566 |
|
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
567 |
def _getSidebarItems(self, params): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
568 |
"""Retrieves a list of sidebar entries for this view from self._params. |
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
569 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
570 |
If params['sidebar'] is None default entries will be constructed |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
571 |
""" |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
572 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
573 |
# Return the found result |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
574 |
if params['sidebar']: |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
575 |
return params['sidebar'] |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
576 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
577 |
# Construct defaults manualy |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
578 |
defaults = params['sidebar_defaults'] |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
579 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
580 |
result = [] |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
581 |
|
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
582 |
for url, menu_text in defaults: |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
583 |
url = url % params['url_name'].lower() |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
584 |
item = (url, menu_text % params) |
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
585 |
result.append(item) |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
586 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
587 |
for item in params['sidebar_additional']: |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
588 |
result.append(item) |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
589 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
590 |
return result |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
591 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
592 |
def getSidebarLinks(self, params=None): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
593 |
"""Returns an dictionary with one sidebar entry. |
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
594 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
595 |
Args: |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
596 |
params: see __init__ |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
597 |
""" |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
598 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
599 |
params = dicts.merge(params, self._params) |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
600 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
601 |
items = [] |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
602 |
|
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
603 |
for url, menu_text in self._getSidebarItems(params): |
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
604 |
items.append({'url': url, 'title': menu_text}) |
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
605 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
606 |
res = {} |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
607 |
|
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
608 |
if not params['sidebar_heading']: |
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
609 |
params['sidebar_heading'] = params['name'] |
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
610 |
|
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
611 |
res['heading'] = params['sidebar_heading'] |
493
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
612 |
res['items'] = items |
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
613 |
|
6976c4d8d0ac
Refactor the sidebar to use Django templates
Sverre Rabbelier <srabbelier@gmail.com>
parents:
492
diff
changeset
|
614 |
return res |
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
615 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
616 |
def getDjangoURLPatterns(self, params=None): |
499
d22e4fe8e64b
Fix missing dots in doc strings and some other doc string corrections.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
497
diff
changeset
|
617 |
"""Retrieves a list of sidebar entries for this view from self._params. |
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
618 |
|
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
619 |
If self._params['django_patterns'] is None default entries will be |
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
620 |
constructed. |
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
621 |
""" |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
622 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
623 |
params = dicts.merge(params, self._params) |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
624 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
625 |
# Return the found result |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
626 |
if params['django_patterns']: |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
627 |
return params['django_patterns'] |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
628 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
629 |
# Construct defaults manualy |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
630 |
default_patterns = params['django_patterns_defaults'] |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
631 |
key_fields_pattern = self.getKeyFieldsPattern(params) |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
632 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
633 |
patterns = [] |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
634 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
635 |
for url, module, name in default_patterns: |
542
7cc99461b64d
Remove redundant dicts for URL patterns and sidebar menu text, and use the
Todd Larsen <tlarsen@google.com>
parents:
539
diff
changeset
|
636 |
name = name % params |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
637 |
module = module % params['module_name'] |
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
638 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
639 |
url = url % { |
502
e1e24c0a4e82
Add new parameters to views: url_name which is name used in urls (instead of using lower entity names) and module_name which is used for constructing django urls. Append changes to all affected files. Fix some title names. Change urls that included underscores like "site_settings" into urls with slash "site/settings". Plus some other minor fixes.
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
500
diff
changeset
|
640 |
'url_name': params['url_name'], |
533
ba3309b2fd30
Move LINK_ID and SCOPE_PATH regular expressions to soc/models/linkable.py.
Todd Larsen <tlarsen@google.com>
parents:
528
diff
changeset
|
641 |
'lnp': linkable.LINK_ID_ARG_PATTERN, |
ba3309b2fd30
Move LINK_ID and SCOPE_PATH regular expressions to soc/models/linkable.py.
Todd Larsen <tlarsen@google.com>
parents:
528
diff
changeset
|
642 |
'ulnp': linkable.LINK_ID_PATTERN_CORE, |
494
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
643 |
'key_fields': key_fields_pattern, |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
644 |
} |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
645 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
646 |
kwargs = {'page_name': name} |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
647 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
648 |
item = (url, module, kwargs, name) |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
649 |
patterns.append(item) |
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
650 |
|
5e9c656a1b68
Refactored SiteMap to be generic
Sverre Rabbelier <srabbelier@gmail.com>
parents:
493
diff
changeset
|
651 |
return patterns |