Mercurial > p > roundup > code
annotate roundup/cgi/templating.py @ 6814:3f60a71b0812
Summary: Support selecion session/otk data store. Add redis as data store.
Allow admin to select the backend data store. Compatibility matrix:
main\/ session>| anydbm | sqlite | redis | mysql | postgresql |
anydbm | D | | X | | |
sqlite | X | D | X | | |
mysql | | | | D | |
postgresql | | | | | D |
--------------------------------------------------------------+
D - default if unconfigured, X - compatible choice
DETAILS
roundup/configuration.py:
add config.ini section sessiondb with settings: backend and redis_url.
CHANGES.txt, doc/admin_guide.txt, doc/installation.txt, doc/upgrading.txt:
doc on config of session db and redis. Plus some other fixes:
admin - clarified why we do not drop __words and __testids
table in native-fts conversion. TYpo fix.
upgrading - doc how you can keep using anydbm for session data with
sqlite. Fix dupe sentence in an upgrading config.ini
section.
roundup/backends/back_anydbm.py, roundup/backends/back_sqlite.py:
code to support redis, redis/anydbm backends respectively.
roundup/backends/sessions_redis.py
new storage backend for redis.
roundup/rest.py, roundup/cgi/actions.py, roundup/cgi/templating.py
redis uses a different way of calculating lifetime/timestamp.
Since expiration of an item occurred if its timestamp was more
than 1 week old, code would calculate:
now - 1 week + lifetime.
But this results in faster expiration in redis if used for
lifetime/timestamp.
Convert code to use the lifetime() method in BasicDatabase
that generates the right timestamp for each backend.
test/session_common.py:
added tests for more cases, get without default, getall non-existing
key etc. timestamp test changed to use new self.get_ts which is
overridden in other tests. Test that datatypes survive storage.
test/test_redis_session.py:
test redis session store with sqlite and anydbm primary databases
test/test_anydbm.py, test/test_sqlite.py
add test to make sure the databases are properly set up
sqlite - add test cases where anydbm is used as datastore
anydbm - remove updateTimestamp override add get_ts().
test/test_config.py
tests on redis_url and compatibility on choice of sessiondb backend
.travis.yml:
add redis db and redis-py
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Thu, 04 Aug 2022 14:41:58 -0400 |
| parents | 99f87b1aefe8 |
| children | fe0091279f50 |
| rev | line source |
|---|---|
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
1 """Implements the API used in the HTML templating for the web interface. |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2 """ |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
3 |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
4 todo = """ |
|
4749
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
5 - Document parameters to Template.render() method |
|
4727
5033c2ad80a7
templating: Rename LoaderBase.get() to LoaderBase.load() for clarity
anatoly techtonik <techtonik@gmail.com>
parents:
4724
diff
changeset
|
6 - Add tests for Loader.load() method |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
7 - Most methods should have a "default" arg to supply a value |
|
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
8 when none appears in the hyperdb or request. |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
9 - Multilink property additions: change_note and new_upload |
|
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
10 - Add class.find() too |
|
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
11 - NumberHTMLProperty should support numeric operations |
|
2324
da4444e593f4
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
2320
diff
changeset
|
12 - LinkHTMLProperty should handle comparisons to strings (cf. linked name) |
|
2411
7ff0a0306877
another TODO
Richard Jones <richard@users.sourceforge.net>
parents:
2396
diff
changeset
|
13 - HTMLRequest.default(self, sort, group, filter, columns, **filterspec): |
|
3843
97d9368ed485
Yet another emacs syntax highlighting workaround.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3842
diff
changeset
|
14 '''Set the request's view arguments to the given values when no |
|
2411
7ff0a0306877
another TODO
Richard Jones <richard@users.sourceforge.net>
parents:
2396
diff
changeset
|
15 values are found in the CGI environment. |
|
3843
97d9368ed485
Yet another emacs syntax highlighting workaround.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3842
diff
changeset
|
16 ''' |
|
2664
8348373b4361
another TODO
Richard Jones <richard@users.sourceforge.net>
parents:
2651
diff
changeset
|
17 - have menu() methods accept filtering arguments |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
18 """ |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
19 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
20 __docformat__ = 'restructuredtext' |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
21 |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
22 # List of schemes that are not rendered as links in rst and markdown. |
|
6284
3f7538316724
issue2551099 - disable processing of data url's in markdown.
John Rouillard <rouilj@ieee.org>
parents:
6282
diff
changeset
|
23 _disable_url_schemes = [ 'javascript', 'data' ] |
|
1931
f1e5e5115c29
Always sort MultilinkHTMLProperty in the correct order...
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
1917
diff
changeset
|
24 |
|
5488
52cb53eedf77
reworked random number use
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5485
diff
changeset
|
25 import base64, cgi, re, os.path, mimetypes, csv, string |
|
5043
ac0c117cd24c
Remove wrap and associated functions from roundup.support
John Kristensen <john@jerrykan.com>
parents:
5006
diff
changeset
|
26 import calendar |
|
ac0c117cd24c
Remove wrap and associated functions from roundup.support
John Kristensen <john@jerrykan.com>
parents:
5006
diff
changeset
|
27 import textwrap |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
28 import time, hashlib |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
29 |
|
5837
883c9e90b403
Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
5809
diff
changeset
|
30 from roundup.anypy.html import html_escape |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
31 |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5399
diff
changeset
|
32 from roundup.anypy import urllib_ |
|
3188
7faae85e1e33
merge from branch
Richard Jones <richard@users.sourceforge.net>
parents:
3183
diff
changeset
|
33 from roundup import hyperdb, date, support |
|
2377
a53f87f2488a
StaticTranslationService moved here out of the code originating from Zope;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2347
diff
changeset
|
34 from roundup import i18n |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
35 from roundup.i18n import _ |
|
5488
52cb53eedf77
reworked random number use
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5485
diff
changeset
|
36 from roundup.anypy.strings import is_us, b2s, s2b, us2s, s2u, u2s, StringIO |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
37 |
|
5388
d26921b851c3
Python 3 preparation: make relative imports explicit.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5381
diff
changeset
|
38 from .KeywordsExpr import render_keywords_expression_editor |
|
4466
f1fe6fd0aa61
Multilinks can be filtered by combining elements with AND, OR and NOT now.
Bernhard Reiter <Bernhard.Reiter@intevation.de>
parents:
4463
diff
changeset
|
39 |
|
5973
fe334430ca07
issue2550919 - Anti-bot signup using 4 second delay
John Rouillard <rouilj@ieee.org>
parents:
5947
diff
changeset
|
40 from roundup.cgi.timestamp import pack_timestamp |
|
fe334430ca07
issue2550919 - Anti-bot signup using 4 second delay
John Rouillard <rouilj@ieee.org>
parents:
5947
diff
changeset
|
41 |
|
5488
52cb53eedf77
reworked random number use
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5485
diff
changeset
|
42 import roundup.anypy.random_ as random_ |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
43 try: |
|
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
44 import cPickle as pickle |
|
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
45 except ImportError: |
|
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
46 import pickle |
|
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
47 try: |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
48 from StructuredText.StructuredText import HTML as StructuredText |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
49 except ImportError: |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
50 try: # older version |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
51 import StructuredText |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
52 except ImportError: |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
53 StructuredText = None |
|
3862
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
54 try: |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
55 from docutils.core import publish_parts as ReStructuredText |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
56 except ImportError: |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
57 ReStructuredText = None |
|
5399
dccae35caa59
Python 3 preparation: update map() calls as needed.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5395
diff
changeset
|
58 try: |
|
dccae35caa59
Python 3 preparation: update map() calls as needed.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5395
diff
changeset
|
59 from itertools import zip_longest |
|
dccae35caa59
Python 3 preparation: update map() calls as needed.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5395
diff
changeset
|
60 except ImportError: |
|
dccae35caa59
Python 3 preparation: update map() calls as needed.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5395
diff
changeset
|
61 from itertools import izip_longest as zip_longest |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
62 |
| 6125 | 63 from roundup.exceptions import RoundupException |
| 64 | |
|
6099
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
65 def _import_markdown2(): |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
66 try: |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
67 import markdown2, re |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
68 class Markdown(markdown2.Markdown): |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
69 # don't allow disabled protocols in links |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
70 _safe_protocols = re.compile('(?!' + ':|'.join([re.escape(s) for s in _disable_url_schemes]) + ':)', re.IGNORECASE) |
|
6099
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
71 |
|
6277
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
72 def _extras(config): |
|
6282
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
73 extras = { 'fenced-code-blocks' : {}, 'nofollow': None } |
|
6277
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
74 if config['MARKDOWN_BREAK_ON_NEWLINE']: |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
75 extras['break-on-newline'] = True |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
76 return extras |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
77 |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
78 markdown = lambda s, c: Markdown(safe_mode='escape', extras=_extras(c)).convert(s) |
|
6099
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
79 except ImportError: |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
80 markdown = None |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
81 |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
82 return markdown |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
83 |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
84 def _import_markdown(): |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
85 try: |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
86 from markdown import markdown as markdown_impl |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
87 from markdown.extensions import Extension as MarkdownExtension |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
88 from markdown.treeprocessors import Treeprocessor |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
89 |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
90 class RestrictLinksProcessor(Treeprocessor): |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
91 def run(self, root): |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
92 for el in root.iter('a'): |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
93 if 'href' in el.attrib: |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
94 url = el.attrib['href'].lstrip(' \r\n\t\x1a\0').lower() |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
95 for s in _disable_url_schemes: |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
96 if url.startswith(s + ':'): |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
97 el.attrib['href'] = '#' |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
98 |
|
6282
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
99 class LinkRendererWithRel(Treeprocessor): |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
100 ''' Rendering class that sets the rel="nofollow noreferer" |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
101 for links. ''' |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
102 rel_value = "nofollow noopener" |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
103 |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
104 def run(self, root): |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
105 for el in root.iter('a'): |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
106 if 'href' in el.attrib: |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
107 url = el.get('href').lstrip(' \r\n\t\x1a\0').lower() |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
108 if not url.startswith('http'): # only add rel for absolute http url's |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
109 continue |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
110 el.set('rel', self.rel_value) |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
111 |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
112 # make sure any HTML tags get escaped and some links restricted |
|
6282
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
113 # and rel="nofollow noopener" are added to links |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
114 class SafeHtml(MarkdownExtension): |
|
6100
d4ce26b14cf5
backward compatibility with older Markdown modules that pass globals arg
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6099
diff
changeset
|
115 def extendMarkdown(self, md, md_globals=None): |
|
6102
0a82437a2930
make sure to use the right deregister api so it works for older versions
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6100
diff
changeset
|
116 if hasattr(md.preprocessors, 'deregister'): |
|
0a82437a2930
make sure to use the right deregister api so it works for older versions
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6100
diff
changeset
|
117 md.preprocessors.deregister('html_block') |
|
0a82437a2930
make sure to use the right deregister api so it works for older versions
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6100
diff
changeset
|
118 else: |
|
0a82437a2930
make sure to use the right deregister api so it works for older versions
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6100
diff
changeset
|
119 del md.preprocessors['html_block'] |
|
0a82437a2930
make sure to use the right deregister api so it works for older versions
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6100
diff
changeset
|
120 if hasattr(md.inlinePatterns, 'deregister'): |
|
0a82437a2930
make sure to use the right deregister api so it works for older versions
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6100
diff
changeset
|
121 md.inlinePatterns.deregister('html') |
|
0a82437a2930
make sure to use the right deregister api so it works for older versions
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6100
diff
changeset
|
122 else: |
|
0a82437a2930
make sure to use the right deregister api so it works for older versions
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6100
diff
changeset
|
123 del md.inlinePatterns['html'] |
|
6099
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
124 |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
125 if hasattr(md.preprocessors, 'register'): |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
126 md.treeprocessors.register(RestrictLinksProcessor(), 'restrict_links', 0) |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
127 else: |
|
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
128 md.treeprocessors['restrict_links'] = RestrictLinksProcessor() |
|
6282
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
129 if hasattr(md.preprocessors, 'register'): |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
130 md.treeprocessors.register(LinkRendererWithRel(), 'add_link_rel', 0) |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
131 else: |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
132 md.treeprocessors['add_link_rel'] = LinkRendererWithRel() |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
133 |
|
6277
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
134 def _extensions(config): |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
135 extensions = [SafeHtml(), 'fenced_code'] |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
136 if config['MARKDOWN_BREAK_ON_NEWLINE']: |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
137 extensions.append('nl2br') |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
138 return extensions |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
139 |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
140 markdown = lambda s, c: markdown_impl(s, extensions=_extensions(c)) |
|
6099
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
141 except ImportError: |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
142 markdown = None |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
143 |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
144 return markdown |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
145 |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
146 def _import_mistune(): |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
147 try: |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
148 import mistune |
|
6282
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
149 from mistune import Renderer, escape_link, escape |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
150 |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
151 mistune._scheme_blacklist = [ s + ':' for s in _disable_url_schemes ] |
|
6277
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
152 |
|
6282
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
153 class LinkRendererWithRel(Renderer): |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
154 ''' Rendering class that sets the rel="nofollow noreferer" |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
155 for links. ''' |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
156 |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
157 rel_value = "nofollow noopener" |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
158 |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
159 def autolink(self, link, is_email=False): |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
160 ''' handle <url or email> style explicit links ''' |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
161 text = link = escape_link(link) |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
162 if is_email: |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
163 link = 'mailto:%s' % link |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
164 return '<a href="%(href)s">%(text)s</a>' % { 'href': link, 'text': text } |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
165 return '<a href="%(href)s" rel="%(rel)s">%(href)s</a>' % { |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
166 'rel': self.rel_value, 'href': escape_link(link)} |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
167 |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
168 def link(self, link, title, content): |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
169 ''' handle [text](url "title") style links and Reference |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
170 links ''' |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
171 |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
172 values = { |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
173 'content': escape(content), |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
174 'href': escape_link(link), |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
175 'rel': self.rel_value, |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
176 'title': escape(title) if title else '', |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
177 } |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
178 |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
179 if title: |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
180 return '<a href="%(href)s" rel="%(rel)s" ' \ |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
181 'title="%(title)s">%(content)s</a>' % values |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
182 |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
183 return '<a href="%(href)s" rel="%(rel)s">%(content)s</a>' % values |
|
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
184 |
|
6277
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
185 def _options(config): |
|
6282
d30501bafdfb
issue2551098: markdown links missing rel="noreferer nofollow"
John Rouillard <rouilj@ieee.org>
parents:
6280
diff
changeset
|
186 options = {'renderer': LinkRendererWithRel(escape = True)} |
|
6277
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
187 if config['MARKDOWN_BREAK_ON_NEWLINE']: |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
188 options['hard_wrap'] = True |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
189 return options |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
190 |
|
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
191 markdown = lambda s, c: mistune.markdown(s, **_options(c)) |
|
6099
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
192 except ImportError: |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
193 markdown = None |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
194 |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
195 return markdown |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
196 |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
197 markdown = _import_markdown2() or _import_markdown() or _import_mistune() |
|
55c56ceacb8e
escape HTML tags in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6098
diff
changeset
|
198 |
| 1049 | 199 # bring in the templating support |
|
6658
408fd477761f
Add i18n object to roundupdb.Database
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6620
diff
changeset
|
200 from roundup.cgi import ZTUtils |
|
2377
a53f87f2488a
StaticTranslationService moved here out of the code originating from Zope;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2347
diff
changeset
|
201 |
|
5488
52cb53eedf77
reworked random number use
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5485
diff
changeset
|
202 def anti_csrf_nonce(client, lifetime=None): |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
203 ''' Create a nonce for defending against CSRF attack. |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
204 |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
205 Then it stores the nonce, the session id for the user |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
206 and the user id in the one time key database for use |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
207 by the csrf validator that runs in the client::inner_main |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
208 module/function. |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
209 ''' |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
210 otks=client.db.getOTKManager() |
|
5488
52cb53eedf77
reworked random number use
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5485
diff
changeset
|
211 key = b2s(base64.b32encode(random_.token_bytes(40))) |
|
5202
47bd81998ddc
My testing was with dbm backends which do an automatic commit on the
John Rouillard <rouilj@ieee.org>
parents:
5201
diff
changeset
|
212 |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
213 while otks.exists(key): |
|
5488
52cb53eedf77
reworked random number use
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5485
diff
changeset
|
214 key = b2s(base64.b32encode(random_.token_bytes(40))) |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
215 |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
216 # lifetime is in minutes. |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
217 if lifetime is None: |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
218 lifetime = client.db.config['WEB_CSRF_TOKEN_LIFETIME'] |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
219 |
|
6814
3f60a71b0812
Summary: Support selecion session/otk data store. Add redis as data store.
John Rouillard <rouilj@ieee.org>
parents:
6706
diff
changeset
|
220 ts = otks.lifetime(lifetime * 60) |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
221 otks.set(key, uid=client.db.getuid(), |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
222 sid=client.session_api._sid, |
|
5211
f4b6a2a3e605
Fix expiration dates and expire csrf tokens properly
John Rouillard <rouilj@ieee.org>
parents:
5202
diff
changeset
|
223 __timestamp=ts ) |
|
5319
62de601bdf6f
Fix commits although a Reject exception is raised
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5264
diff
changeset
|
224 otks.commit() |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
225 return key |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
226 |
|
2377
a53f87f2488a
StaticTranslationService moved here out of the code originating from Zope;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2347
diff
changeset
|
227 ### templating |
|
a53f87f2488a
StaticTranslationService moved here out of the code originating from Zope;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2347
diff
changeset
|
228 |
|
6123
c177e7128dc9
issue2551083 Replace BaseException and Exception with RoundupException
John Rouillard <rouilj@ieee.org>
parents:
6104
diff
changeset
|
229 class NoTemplate(RoundupException): |
|
1068
665730c27d29
nicer template absence error
Richard Jones <richard@users.sourceforge.net>
parents:
1067
diff
changeset
|
230 pass |
|
665730c27d29
nicer template absence error
Richard Jones <richard@users.sourceforge.net>
parents:
1067
diff
changeset
|
231 |
|
6123
c177e7128dc9
issue2551083 Replace BaseException and Exception with RoundupException
John Rouillard <rouilj@ieee.org>
parents:
6104
diff
changeset
|
232 class Unauthorised(RoundupException): |
|
2466
7b248ea0a2e5
add translation to Unauthorised exception; mark missed text for translation
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2458
diff
changeset
|
233 def __init__(self, action, klass, translator=None): |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
234 self.action = action |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
235 self.klass = klass |
|
2466
7b248ea0a2e5
add translation to Unauthorised exception; mark missed text for translation
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2458
diff
changeset
|
236 if translator: |
|
7b248ea0a2e5
add translation to Unauthorised exception; mark missed text for translation
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2458
diff
changeset
|
237 self._ = translator.gettext |
|
7b248ea0a2e5
add translation to Unauthorised exception; mark missed text for translation
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2458
diff
changeset
|
238 else: |
|
2561
0dd3dca6bd01
always use translation service set in the tracker client instance;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2558
diff
changeset
|
239 self._ = TranslationService.get_translation().gettext |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
240 def __str__(self): |
|
2466
7b248ea0a2e5
add translation to Unauthorised exception; mark missed text for translation
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2458
diff
changeset
|
241 return self._('You are not allowed to %(action)s ' |
|
7b248ea0a2e5
add translation to Unauthorised exception; mark missed text for translation
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2458
diff
changeset
|
242 'items of class %(class)s') % { |
|
7b248ea0a2e5
add translation to Unauthorised exception; mark missed text for translation
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2458
diff
changeset
|
243 'action': self.action, 'class': self.klass} |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
244 |
|
4747
955860a18e12
templating: Raise exception if configured template engine is unknown
anatoly techtonik <techtonik@gmail.com>
parents:
4743
diff
changeset
|
245 |
|
955860a18e12
templating: Raise exception if configured template engine is unknown
anatoly techtonik <techtonik@gmail.com>
parents:
4743
diff
changeset
|
246 # --- Template Loader API |
|
955860a18e12
templating: Raise exception if configured template engine is unknown
anatoly techtonik <techtonik@gmail.com>
parents:
4743
diff
changeset
|
247 |
|
4719
05fe39f1d823
API break, bumping version to 1.15.0, renamed TemplatesBase to
anatoly techtonik <techtonik@gmail.com>
parents:
4696
diff
changeset
|
248 class LoaderBase: |
|
4740
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
249 """ Base for engine-specific template Loader class.""" |
|
4743
2d6959f1d2df
templating: proof of concept for Jinja2 support. Select 'jinja2'
anatoly techtonik <techtonik@gmail.com>
parents:
4742
diff
changeset
|
250 def __init__(self, dir): |
|
2d6959f1d2df
templating: proof of concept for Jinja2 support. Select 'jinja2'
anatoly techtonik <techtonik@gmail.com>
parents:
4742
diff
changeset
|
251 # loaders are given the template directory as a first argument |
|
2d6959f1d2df
templating: proof of concept for Jinja2 support. Select 'jinja2'
anatoly techtonik <techtonik@gmail.com>
parents:
4742
diff
changeset
|
252 pass |
|
2d6959f1d2df
templating: proof of concept for Jinja2 support. Select 'jinja2'
anatoly techtonik <techtonik@gmail.com>
parents:
4742
diff
changeset
|
253 |
|
4748
e339583eae8e
templating: rename precompileTemplates to precompile
anatoly techtonik <techtonik@gmail.com>
parents:
4747
diff
changeset
|
254 def precompile(self): |
|
e339583eae8e
templating: rename precompileTemplates to precompile
anatoly techtonik <techtonik@gmail.com>
parents:
4747
diff
changeset
|
255 """ This method may be called when tracker is loaded to precompile |
|
e339583eae8e
templating: rename precompileTemplates to precompile
anatoly techtonik <techtonik@gmail.com>
parents:
4747
diff
changeset
|
256 templates that support this ability. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
257 """ |
|
4749
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
258 pass |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
259 |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
260 def load(self, tplname): |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
261 """ Load template and return template object with render() method. |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
262 |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
263 "tplname" is a template name. For filesystem loaders it is a |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
264 filename without extensions, typically in the "classname.view" |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
265 format. |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
266 """ |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
267 raise NotImplementedError |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
268 |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
269 def check(self, name): |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
270 """ Check if template with the given name exists. Should return |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
271 false if template can not be found. |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
272 """ |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
273 raise NotImplementedError |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
274 |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
275 class TALLoaderBase(LoaderBase): |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
276 """ Common methods for the legacy TAL loaders.""" |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
277 |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
278 def __init__(self, dir): |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
279 self.dir = dir |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
280 |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
281 def _find(self, name): |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
282 """ Find template, return full path and filename of the |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
283 template if it is found, None otherwise.""" |
|
5145
d22eb1d40d0e
issue2550701, issue2550891 deal with path traversal issue in TAL based template finding code. Use standard method.
John Rouillard <rouilj@ieee.org>
parents:
5112
diff
changeset
|
284 realsrc = os.path.realpath(self.dir) |
|
4749
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
285 for extension in ['', '.html', '.xml']: |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
286 f = name + extension |
|
5145
d22eb1d40d0e
issue2550701, issue2550891 deal with path traversal issue in TAL based template finding code. Use standard method.
John Rouillard <rouilj@ieee.org>
parents:
5112
diff
changeset
|
287 src = os.path.join(realsrc, f) |
|
d22eb1d40d0e
issue2550701, issue2550891 deal with path traversal issue in TAL based template finding code. Use standard method.
John Rouillard <rouilj@ieee.org>
parents:
5112
diff
changeset
|
288 realpath = os.path.realpath(src) |
|
5423
58057ea53779
Python 3 preparation: avoid string.find.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5418
diff
changeset
|
289 if not realpath.startswith(realsrc): |
|
5145
d22eb1d40d0e
issue2550701, issue2550891 deal with path traversal issue in TAL based template finding code. Use standard method.
John Rouillard <rouilj@ieee.org>
parents:
5112
diff
changeset
|
290 return # will raise invalid template |
|
4749
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
291 if os.path.exists(src): |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
292 return (src, f) |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
293 |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
294 def check(self, name): |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
295 return bool(self._find(name)) |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
296 |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
297 def precompile(self): |
|
0421390b3094
templating: Move common TAL methods to TALLoaderBase class
anatoly techtonik <techtonik@gmail.com>
parents:
4748
diff
changeset
|
298 """ Precompile templates in load directory by loading them """ |
|
1204
b862bbf2067a
Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents:
1202
diff
changeset
|
299 for filename in os.listdir(self.dir): |
|
2854
6acc315570eb
Templates.precompileTemplates: skip files without ".html" extension
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2827
diff
changeset
|
300 # skip subdirs |
|
6acc315570eb
Templates.precompileTemplates: skip files without ".html" extension
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2827
diff
changeset
|
301 if os.path.isdir(filename): |
|
6acc315570eb
Templates.precompileTemplates: skip files without ".html" extension
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2827
diff
changeset
|
302 continue |
| 2961 | 303 |
|
2959
fa5410ae581d
allow use of XML templates again
Richard Jones <richard@users.sourceforge.net>
parents:
2956
diff
changeset
|
304 # skip files without ".html" or ".xml" extension - .css, .js etc. |
|
fa5410ae581d
allow use of XML templates again
Richard Jones <richard@users.sourceforge.net>
parents:
2956
diff
changeset
|
305 for extension in '.html', '.xml': |
|
fa5410ae581d
allow use of XML templates again
Richard Jones <richard@users.sourceforge.net>
parents:
2956
diff
changeset
|
306 if filename.endswith(extension): |
|
fa5410ae581d
allow use of XML templates again
Richard Jones <richard@users.sourceforge.net>
parents:
2956
diff
changeset
|
307 break |
|
fa5410ae581d
allow use of XML templates again
Richard Jones <richard@users.sourceforge.net>
parents:
2956
diff
changeset
|
308 else: |
|
fa5410ae581d
allow use of XML templates again
Richard Jones <richard@users.sourceforge.net>
parents:
2956
diff
changeset
|
309 continue |
|
fa5410ae581d
allow use of XML templates again
Richard Jones <richard@users.sourceforge.net>
parents:
2956
diff
changeset
|
310 |
| 2961 | 311 # remove extension |
|
2959
fa5410ae581d
allow use of XML templates again
Richard Jones <richard@users.sourceforge.net>
parents:
2956
diff
changeset
|
312 filename = filename[:-len(extension)] |
|
4740
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
313 self.load(filename) |
|
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
314 |
|
1204
b862bbf2067a
Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents:
1202
diff
changeset
|
315 def __getitem__(self, name): |
|
4724
98b727b6f7f8
Self-focument API in templating.py loader class
anatoly techtonik <techtonik@gmail.com>
parents:
4721
diff
changeset
|
316 """Special method to access templates by loader['name']""" |
|
1204
b862bbf2067a
Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents:
1202
diff
changeset
|
317 try: |
|
4740
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
318 return self.load(name) |
|
5248
198b6e810c67
Use Python-3-compatible 'as' syntax for except statements
Eric S. Raymond <esr@thyrsus.com>
parents:
5232
diff
changeset
|
319 except NoTemplate as message: |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
320 raise KeyError(message) |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
321 |
|
4750
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
322 class MultiLoader(LoaderBase): |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
323 def __init__(self): |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
324 self.loaders = [] |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
325 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
326 def add_loader(self, loader): |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
327 self.loaders.append(loader) |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
328 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
329 def check(self, name): |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
330 for l in self.loaders: |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
331 if l.check(name): |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
332 return True |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
333 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
334 def load(self, name): |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
335 for l in self.loaders: |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
336 if l.check(name): |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
337 return l.load(name) |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
338 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
339 def __getitem__(self, name): |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
340 """Needed for TAL templates compatibility""" |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
341 # [ ] document root and helper templates |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
342 try: |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
343 return self.load(name) |
|
5248
198b6e810c67
Use Python-3-compatible 'as' syntax for except statements
Eric S. Raymond <esr@thyrsus.com>
parents:
5232
diff
changeset
|
344 except NoTemplate as message: |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
345 raise KeyError(message) |
|
4750
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
346 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
347 |
|
4743
2d6959f1d2df
templating: proof of concept for Jinja2 support. Select 'jinja2'
anatoly techtonik <techtonik@gmail.com>
parents:
4742
diff
changeset
|
348 class TemplateBase: |
|
2d6959f1d2df
templating: proof of concept for Jinja2 support. Select 'jinja2'
anatoly techtonik <techtonik@gmail.com>
parents:
4742
diff
changeset
|
349 content_type = 'text/html' |
|
4740
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
350 |
|
4750
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
351 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
352 def get_loader(dir, template_engine): |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
353 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
354 # Support for multiple engines using fallback mechanizm |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
355 # meaning that if first engine can't find template, we |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
356 # use the second |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
357 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
358 engines = template_engine.split(',') |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
359 engines = [x.strip() for x in engines] |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
360 ml = MultiLoader() |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
361 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
362 for engine_name in engines: |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
363 if engine_name == 'chameleon': |
|
5388
d26921b851c3
Python 3 preparation: make relative imports explicit.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5381
diff
changeset
|
364 from .engine_chameleon import Loader |
|
4750
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
365 elif engine_name == 'jinja2': |
|
5388
d26921b851c3
Python 3 preparation: make relative imports explicit.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5381
diff
changeset
|
366 from .engine_jinja2 import Jinja2Loader as Loader |
|
4750
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
367 elif engine_name == 'zopetal': |
|
5388
d26921b851c3
Python 3 preparation: make relative imports explicit.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5381
diff
changeset
|
368 from .engine_zopetal import Loader |
|
4750
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
369 else: |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
370 raise Exception('Unknown template engine "%s"' % engine_name) |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
371 ml.add_loader(Loader(dir)) |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
372 |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
373 if len(engines) == 1: |
|
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
374 return ml.loaders[0] |
|
4747
955860a18e12
templating: Raise exception if configured template engine is unknown
anatoly techtonik <techtonik@gmail.com>
parents:
4743
diff
changeset
|
375 else: |
|
4750
12b029655c05
Templating proof of concept to use multiple engines simultaneously,
anatoly techtonik <techtonik@gmail.com>
parents:
4749
diff
changeset
|
376 return ml |
|
4587
a2eb4fb3e6d8
New Chameleon templating engine, engine is now configurable.
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4584
diff
changeset
|
377 |
|
4747
955860a18e12
templating: Raise exception if configured template engine is unknown
anatoly techtonik <techtonik@gmail.com>
parents:
4743
diff
changeset
|
378 # --/ Template Loader API |
|
955860a18e12
templating: Raise exception if configured template engine is unknown
anatoly techtonik <techtonik@gmail.com>
parents:
4743
diff
changeset
|
379 |
|
955860a18e12
templating: Raise exception if configured template engine is unknown
anatoly techtonik <techtonik@gmail.com>
parents:
4743
diff
changeset
|
380 |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
381 def context(client, template=None, classname=None, request=None): |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
382 """Return the rendering context dictionary |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
383 |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
384 The dictionary includes following symbols: |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
385 |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
386 *context* |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
387 this is one of three things: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
388 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
389 1. None - we're viewing a "home" page |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
390 2. The current class of item being displayed. This is an HTMLClass |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
391 instance. |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
392 3. The current item from the database, if we're viewing a specific |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
393 item, as an HTMLItem instance. |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
394 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
395 *request* |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
396 Includes information about the current request, including: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
397 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
398 - the url |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
399 - the current index information (``filterspec``, ``filter`` args, |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
400 ``properties``, etc) parsed out of the form. |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
401 - methods for easy filterspec link generation |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
402 - *user*, the current user node as an HTMLItem instance |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
403 - *form*, the current CGI form information as a FieldStorage |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
404 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
405 *config* |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
406 The current tracker config. |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
407 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
408 *db* |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
409 The current database, used to access arbitrary database items. |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
410 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
411 *utils* |
|
4584
760483ce731e
Fix override of TemplatingUtils in instance.py.
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4577
diff
changeset
|
412 This is an instance of client.instance.TemplatingUtils, which is |
|
760483ce731e
Fix override of TemplatingUtils in instance.py.
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4577
diff
changeset
|
413 optionally defined in the tracker interfaces module and defaults to |
|
760483ce731e
Fix override of TemplatingUtils in instance.py.
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4577
diff
changeset
|
414 TemplatingUtils class in this file. |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
415 |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
416 *templates* |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
417 Access to all the tracker templates by name. |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
418 Used mainly in *use-macro* commands. |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
419 |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
420 *template* |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
421 Current rendering template. |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
422 |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
423 *true* |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
424 Logical True value. |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
425 |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
426 *false* |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
427 Logical False value. |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
428 |
|
2562
1f4791438b65
add 'i18n' to the rendering context dictionary description
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2561
diff
changeset
|
429 *i18n* |
|
1f4791438b65
add 'i18n' to the rendering context dictionary description
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2561
diff
changeset
|
430 Internationalization service, providing string translation |
|
1f4791438b65
add 'i18n' to the rendering context dictionary description
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2561
diff
changeset
|
431 methods ``gettext`` and ``ngettext``. |
|
1f4791438b65
add 'i18n' to the rendering context dictionary description
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2561
diff
changeset
|
432 |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
433 """ |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
434 |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
435 # if template, classname and/or request are not passed explicitely, |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
436 # compute form client |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
437 if template is None: |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
438 template = client.template |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
439 if classname is None: |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
440 classname = client.classname |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
441 if request is None: |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
442 request = HTMLRequest(client) |
|
1270
c3424abf7f77
added ability to implement new templating utility methods
Richard Jones <richard@users.sourceforge.net>
parents:
1263
diff
changeset
|
443 |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
444 c = { |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
445 'context': None, |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
446 'options': {}, |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
447 'nothing': None, |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
448 'request': request, |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
449 'db': HTMLDatabase(client), |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
450 'config': client.instance.config, |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
451 'tracker': client.instance, |
|
4584
760483ce731e
Fix override of TemplatingUtils in instance.py.
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4577
diff
changeset
|
452 'utils': client.instance.TemplatingUtils(client), |
|
2854
6acc315570eb
Templates.precompileTemplates: skip files without ".html" extension
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2827
diff
changeset
|
453 'templates': client.instance.templates, |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
454 'template': template, |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
455 'true': 1, |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
456 'false': 0, |
|
2538
09b0fc5b1716
make client.translator available to templates as 'i18n'
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2524
diff
changeset
|
457 'i18n': client.translator |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
458 } |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
459 # add in the item if there is one |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
460 if client.nodeid: |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
461 c['context'] = HTMLItem(client, classname, client.nodeid, |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
462 anonymous=1) |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
463 elif classname in client.db.classes: |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
464 c['context'] = HTMLClass(client, classname, anonymous=1) |
|
2390
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
465 return c |
|
0778421414c3
added module function context()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2389
diff
changeset
|
466 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
467 class HTMLDatabase: |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
468 """ Return HTMLClasses for valid class fetches |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
469 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
470 def __init__(self, client): |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
471 self._client = client |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
472 self._ = client._ |
|
1513
455f79a2981f
add access to real db through HTML db
Richard Jones <richard@users.sourceforge.net>
parents:
1510
diff
changeset
|
473 self._db = client.db |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
474 |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
475 # we want config to be exposed |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
476 self.config = client.db.config |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
477 |
|
4055
de832c486f86
Fix designator regular expression in HTMLDatabase.__getitem__.
Stefan Seefeld <stefan@seefeld.name>
parents:
4054
diff
changeset
|
478 def __getitem__(self, item, desre=re.compile(r'(?P<cl>[a-zA-Z_]+)(?P<id>[-\d]+)')): |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
479 # check to see if we're actually accessing an item |
|
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
480 m = desre.match(item) |
|
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
481 if m: |
|
2157
e976fa0640b3
db/userN wasn't returning HTMLUser
Richard Jones <richard@users.sourceforge.net>
parents:
2154
diff
changeset
|
482 cl = m.group('cl') |
|
e976fa0640b3
db/userN wasn't returning HTMLUser
Richard Jones <richard@users.sourceforge.net>
parents:
2154
diff
changeset
|
483 self._client.db.getclass(cl) |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
484 return HTMLItem(self._client, cl, m.group('id')) |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
485 else: |
|
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
486 self._client.db.getclass(item) |
|
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
487 return HTMLClass(self._client, item) |
|
1134
16874c9b86ad
generic item editing
Richard Jones <richard@users.sourceforge.net>
parents:
1133
diff
changeset
|
488 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
489 def __getattr__(self, attr): |
|
1030
f5216dbced55
translate bad class lookup error meaningfully
Richard Jones <richard@users.sourceforge.net>
parents:
1028
diff
changeset
|
490 try: |
|
1134
16874c9b86ad
generic item editing
Richard Jones <richard@users.sourceforge.net>
parents:
1133
diff
changeset
|
491 return self[attr] |
|
1030
f5216dbced55
translate bad class lookup error meaningfully
Richard Jones <richard@users.sourceforge.net>
parents:
1028
diff
changeset
|
492 except KeyError: |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
493 raise AttributeError(attr) |
|
1134
16874c9b86ad
generic item editing
Richard Jones <richard@users.sourceforge.net>
parents:
1133
diff
changeset
|
494 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
495 def classes(self): |
|
5395
23b8e6067f7c
Python 3 preparation: update calls to dict methods.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5388
diff
changeset
|
496 l = sorted(self._client.db.classes.keys()) |
|
2118
917826e3fb54
In the classes method of HTMLDatabase, the variable 'm' was undefined.
Brian Kelley <wc2so1@users.sourceforge.net>
parents:
2116
diff
changeset
|
497 m = [] |
|
2031
bcb21e5722b8
fix permission handling around rego
Richard Jones <richard@users.sourceforge.net>
parents:
2025
diff
changeset
|
498 for item in l: |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
499 m.append(HTMLClass(self._client, item)) |
|
2118
917826e3fb54
In the classes method of HTMLDatabase, the variable 'm' was undefined.
Brian Kelley <wc2so1@users.sourceforge.net>
parents:
2116
diff
changeset
|
500 return m |
|
1104
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
501 |
| 5809 | 502 num_re = re.compile(r'^-?\d+$') |
|
3860
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
503 |
|
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
504 def lookupIds(db, prop, ids, fail_ok=0, num_re=num_re, do_lookup=True): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
505 """ "fail_ok" should be specified if we wish to pass through bad values |
|
2049
5a5f66e6b0e1
forward-port of fix from maint-0-6
Richard Jones <richard@users.sourceforge.net>
parents:
2037
diff
changeset
|
506 (most likely form values that we wish to represent back to the user) |
|
3860
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
507 "do_lookup" is there for preventing lookup by key-value (if we |
|
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
508 know that the value passed *is* an id) |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
509 """ |
|
1104
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
510 cl = db.getclass(prop.classname) |
|
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
511 l = [] |
|
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
512 for entry in ids: |
|
5927
a2a7860502fa
Fix lookupIds for try_id_parsing off
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5907
diff
changeset
|
513 # Do not look up numeric IDs if try_id_parsing |
|
a2a7860502fa
Fix lookupIds for try_id_parsing off
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5907
diff
changeset
|
514 if prop.try_id_parsing and num_re.match(entry): |
|
5876
716d50585c8d
Fix Link/Multilink searching
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5837
diff
changeset
|
515 l.append(entry) |
|
716d50585c8d
Fix Link/Multilink searching
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5837
diff
changeset
|
516 continue |
|
3861
d4ac8954ce5c
Update on recent fix, better version suggested by alexander smishlajev
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3860
diff
changeset
|
517 if do_lookup: |
|
d4ac8954ce5c
Update on recent fix, better version suggested by alexander smishlajev
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3860
diff
changeset
|
518 try: |
|
d4ac8954ce5c
Update on recent fix, better version suggested by alexander smishlajev
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3860
diff
changeset
|
519 item = cl.lookup(entry) |
|
d4ac8954ce5c
Update on recent fix, better version suggested by alexander smishlajev
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3860
diff
changeset
|
520 except (TypeError, KeyError): |
|
d4ac8954ce5c
Update on recent fix, better version suggested by alexander smishlajev
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3860
diff
changeset
|
521 pass |
|
d4ac8954ce5c
Update on recent fix, better version suggested by alexander smishlajev
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3860
diff
changeset
|
522 else: |
|
d4ac8954ce5c
Update on recent fix, better version suggested by alexander smishlajev
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3860
diff
changeset
|
523 l.append(item) |
|
3860
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
524 continue |
|
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
525 # if fail_ok, ignore lookup error |
|
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
526 # otherwise entry must be existing object id rather than key value |
|
5876
716d50585c8d
Fix Link/Multilink searching
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5837
diff
changeset
|
527 if fail_ok: |
|
3860
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
528 l.append(entry) |
|
1104
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
529 return l |
|
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
530 |
|
3860
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
531 def lookupKeys(linkcl, key, ids, num_re=num_re): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
532 """ Look up the "key" values for "ids" list - though some may already |
|
2083
a94eacad51c8
handle bad multilink input at item creation time better [SF#917834]
Richard Jones <richard@users.sourceforge.net>
parents:
2056
diff
changeset
|
533 be key values, not ids. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
534 """ |
|
2083
a94eacad51c8
handle bad multilink input at item creation time better [SF#917834]
Richard Jones <richard@users.sourceforge.net>
parents:
2056
diff
changeset
|
535 l = [] |
|
a94eacad51c8
handle bad multilink input at item creation time better [SF#917834]
Richard Jones <richard@users.sourceforge.net>
parents:
2056
diff
changeset
|
536 for entry in ids: |
|
a94eacad51c8
handle bad multilink input at item creation time better [SF#917834]
Richard Jones <richard@users.sourceforge.net>
parents:
2056
diff
changeset
|
537 if num_re.match(entry): |
|
5051
b69c5e763295
issue2550748: Crash when creating new issues with non-existing multilink values (in classic template). Applied patch provided by user. (John Rouillard)
John Rouillard <rouilj@ieee.org>
parents:
5043
diff
changeset
|
538 try: |
|
5193
cfd6d1f2caa1
Fix incorrect indentation using tabs
John Kristensen <john@jerrykan.com>
parents:
5192
diff
changeset
|
539 label = linkcl.get(entry, key) |
|
cfd6d1f2caa1
Fix incorrect indentation using tabs
John Kristensen <john@jerrykan.com>
parents:
5192
diff
changeset
|
540 except IndexError: |
|
cfd6d1f2caa1
Fix incorrect indentation using tabs
John Kristensen <john@jerrykan.com>
parents:
5192
diff
changeset
|
541 # fall back to id if illegal (avoid template crash) |
|
5051
b69c5e763295
issue2550748: Crash when creating new issues with non-existing multilink values (in classic template). Applied patch provided by user. (John Rouillard)
John Rouillard <rouilj@ieee.org>
parents:
5043
diff
changeset
|
542 label = entry |
|
3401
62e4032cb280
merge from maint-0-8
Richard Jones <richard@users.sourceforge.net>
parents:
3394
diff
changeset
|
543 # fall back to designator if label is None |
|
62e4032cb280
merge from maint-0-8
Richard Jones <richard@users.sourceforge.net>
parents:
3394
diff
changeset
|
544 if label is None: label = '%s%s'%(linkcl.classname, entry) |
|
62e4032cb280
merge from maint-0-8
Richard Jones <richard@users.sourceforge.net>
parents:
3394
diff
changeset
|
545 l.append(label) |
|
2083
a94eacad51c8
handle bad multilink input at item creation time better [SF#917834]
Richard Jones <richard@users.sourceforge.net>
parents:
2056
diff
changeset
|
546 else: |
|
a94eacad51c8
handle bad multilink input at item creation time better [SF#917834]
Richard Jones <richard@users.sourceforge.net>
parents:
2056
diff
changeset
|
547 l.append(entry) |
|
a94eacad51c8
handle bad multilink input at item creation time better [SF#917834]
Richard Jones <richard@users.sourceforge.net>
parents:
2056
diff
changeset
|
548 return l |
|
a94eacad51c8
handle bad multilink input at item creation time better [SF#917834]
Richard Jones <richard@users.sourceforge.net>
parents:
2056
diff
changeset
|
549 |
|
3710
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
550 def _set_input_default_args(dic): |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
551 # 'text' is the default value anyway -- |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
552 # but for CSS usage it should be present |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
553 dic.setdefault('type', 'text') |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
554 # useful e.g for HTML LABELs: |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
555 if 'id' not in dic: |
|
3710
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
556 try: |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
557 if dic['text'] in ('radio', 'checkbox'): |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
558 dic['id'] = '%(name)s-%(value)s' % dic |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
559 else: |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
560 dic['id'] = dic['name'] |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
561 except KeyError: |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
562 pass |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
563 |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
564 def html4_cgi_escape_attrs(**attrs): |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
565 ''' Boolean attributes like 'disabled', 'required' |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
566 are represented without a value. E.G. |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
567 <input required ..> not <input required="required" ...> |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
568 The latter is xhtml. Recognize booleans by: |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
569 value is None |
|
6058
8fbcaac944e7
Different fix for displaying booleans properly in xhtml vs html
John Rouillard <rouilj@ieee.org>
parents:
6057
diff
changeset
|
570 Code can use None to indicate a pure boolean. |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
571 ''' |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
572 return ' '.join(['%s="%s"'%(k,html_escape(str(v), True)) |
|
6058
8fbcaac944e7
Different fix for displaying booleans properly in xhtml vs html
John Rouillard <rouilj@ieee.org>
parents:
6057
diff
changeset
|
573 if v != None else '%s'%(k) |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
574 for k,v in sorted(attrs.items())]) |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
575 |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
576 def xhtml_cgi_escape_attrs(**attrs): |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
577 ''' Boolean attributes like 'disabled', 'required' |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
578 are represented with a value that is the same as |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
579 the attribute name.. E.G. |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
580 <input required="required" ...> not <input required ..> |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
581 The latter is html4 or 5. Recognize booleans by: |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
582 value is None |
|
6058
8fbcaac944e7
Different fix for displaying booleans properly in xhtml vs html
John Rouillard <rouilj@ieee.org>
parents:
6057
diff
changeset
|
583 Code can use None to indicate a pure boolean. |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
584 ''' |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
585 return ' '.join(['%s="%s"'%(k,html_escape(str(v), True)) |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
586 if v != None else '%s="%s"'%(k,k) |
|
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
587 for k,v in sorted(attrs.items())]) |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
588 |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
589 def input_html4(**attrs): |
|
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
590 """Generate an 'input' (html4) element with given attributes""" |
|
3909
e89bcb28f683
indexargs_url force ids to int
Justus Pendleton <jpend@users.sourceforge.net>
parents:
3905
diff
changeset
|
591 _set_input_default_args(attrs) |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
592 return '<input %s>'%html4_cgi_escape_attrs(**attrs) |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
593 |
|
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
594 def input_xhtml(**attrs): |
|
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
595 """Generate an 'input' (xhtml) element with given attributes""" |
|
3710
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
596 _set_input_default_args(attrs) |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
597 return '<input %s/>'%xhtml_cgi_escape_attrs(**attrs) |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
598 |
|
4878
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
599 class HTMLInputMixin(object): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
600 """ requires a _client property """ |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
601 def __init__(self): |
|
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
602 html_version = 'html4' |
|
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
603 if hasattr(self._client.instance.config, 'HTML_VERSION'): |
|
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
604 html_version = self._client.instance.config.HTML_VERSION |
|
6058
8fbcaac944e7
Different fix for displaying booleans properly in xhtml vs html
John Rouillard <rouilj@ieee.org>
parents:
6057
diff
changeset
|
605 if html_version == 'xhtml': |
|
8fbcaac944e7
Different fix for displaying booleans properly in xhtml vs html
John Rouillard <rouilj@ieee.org>
parents:
6057
diff
changeset
|
606 self.input = input_xhtml |
|
8fbcaac944e7
Different fix for displaying booleans properly in xhtml vs html
John Rouillard <rouilj@ieee.org>
parents:
6057
diff
changeset
|
607 self.cgi_escape_attrs=xhtml_cgi_escape_attrs |
|
8fbcaac944e7
Different fix for displaying booleans properly in xhtml vs html
John Rouillard <rouilj@ieee.org>
parents:
6057
diff
changeset
|
608 else: |
|
8fbcaac944e7
Different fix for displaying booleans properly in xhtml vs html
John Rouillard <rouilj@ieee.org>
parents:
6057
diff
changeset
|
609 self.input = input_html4 |
|
8fbcaac944e7
Different fix for displaying booleans properly in xhtml vs html
John Rouillard <rouilj@ieee.org>
parents:
6057
diff
changeset
|
610 self.cgi_escape_attrs=html4_cgi_escape_attrs |
|
2396
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
611 # self._context is used for translations. |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
612 # will be initialized by the first call to .gettext() |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
613 self._context = None |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
614 |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
615 def gettext(self, msgid): |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
616 """Return the localized translation of msgid""" |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
617 if self._context is None: |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
618 self._context = context(self._client) |
|
2561
0dd3dca6bd01
always use translation service set in the tracker client instance;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2558
diff
changeset
|
619 return self._client.translator.translate(domain="roundup", |
|
2396
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
620 msgid=msgid, context=self._context) |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
621 |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
622 _ = gettext |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
623 |
|
4878
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
624 class HTMLPermissions(object): |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
625 |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
626 def view_check(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
627 """ Raise the Unauthorised exception if the user's not permitted to |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
628 view this class. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
629 """ |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
630 if not self.is_view_ok(): |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
631 raise Unauthorised("view", self._classname, |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
632 translator=self._client.translator) |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
633 |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
634 def edit_check(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
635 """ Raise the Unauthorised exception if the user's not permitted to |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
636 edit items of this class. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
637 """ |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
638 if not self.is_edit_ok(): |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
639 raise Unauthorised("edit", self._classname, |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
640 translator=self._client.translator) |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
641 |
|
4088
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
642 def retire_check(self): |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
643 """ Raise the Unauthorised exception if the user's not permitted to |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
644 retire items of this class. |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
645 """ |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
646 if not self.is_retire_ok(): |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
647 raise Unauthorised("retire", self._classname, |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
648 translator=self._client.translator) |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
649 |
|
2983
9614a101b68f
Stuff from the train ride this morning:
Richard Jones <richard@users.sourceforge.net>
parents:
2962
diff
changeset
|
650 |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
651 class HTMLClass(HTMLInputMixin, HTMLPermissions): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
652 """ Accesses through a class (either through *class* or *db.<classname>*) |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
653 """ |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
654 def __init__(self, client, classname, anonymous=0): |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
655 self._client = client |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
656 self._ = client._ |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
657 self._db = client.db |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
658 self._anonymous = anonymous |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
659 |
|
1136
7e193bbda38e
added generic item editing
Richard Jones <richard@users.sourceforge.net>
parents:
1134
diff
changeset
|
660 # we want classname to be exposed, but _classname gives a |
|
7e193bbda38e
added generic item editing
Richard Jones <richard@users.sourceforge.net>
parents:
1134
diff
changeset
|
661 # consistent API for extending Class/Item |
|
7e193bbda38e
added generic item editing
Richard Jones <richard@users.sourceforge.net>
parents:
1134
diff
changeset
|
662 self._classname = self.classname = classname |
|
1204
b862bbf2067a
Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents:
1202
diff
changeset
|
663 self._klass = self._db.getclass(self.classname) |
|
b862bbf2067a
Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents:
1202
diff
changeset
|
664 self._props = self._klass.getprops() |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
665 |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
666 HTMLInputMixin.__init__(self) |
|
1952
c40ed9113285
Applied Stefan Seefeld's html4/xhtml patch with some changes.
Richard Jones <richard@users.sourceforge.net>
parents:
1932
diff
changeset
|
667 |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
668 def is_edit_ok(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
669 """ Is the user allowed to Create the current class? |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
670 """ |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
671 perm = self._db.security.hasPermission |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
672 return perm('Web Access', self._client.userid) and perm('Create', |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
673 self._client.userid, self._classname) |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
674 |
|
4088
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
675 def is_retire_ok(self): |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
676 """ Is the user allowed to retire items of the current class? |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
677 """ |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
678 perm = self._db.security.hasPermission |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
679 return perm('Web Access', self._client.userid) and perm('Retire', |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
680 self._client.userid, self._classname) |
|
4088
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
681 |
|
6150
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
682 def is_restore_ok(self): |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
683 """ Is the user allowed to restore retired items of the current class? |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
684 """ |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
685 perm = self._db.security.hasPermission |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
686 return perm('Web Access', self._client.userid) and perm('Restore', |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
687 self._client.userid, self._classname) |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
688 |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
689 def is_view_ok(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
690 """ Is the user allowed to View the current class? |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
691 """ |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
692 perm = self._db.security.hasPermission |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
693 return perm('Web Access', self._client.userid) and perm('View', |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
694 self._client.userid, self._classname) |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
695 |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
696 def is_only_view_ok(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
697 """ Is the user only allowed to View (ie. not Create) the current class? |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
698 """ |
|
2651
17bab083c8a0
Couple of fixes - make the interface just be is_edit_ok...
Richard Jones <richard@users.sourceforge.net>
parents:
2649
diff
changeset
|
699 return self.is_view_ok() and not self.is_edit_ok() |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
700 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
701 def __repr__(self): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
702 return '<HTMLClass(0x%x) %s>'%(id(self), self.classname) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
703 |
| 1002 | 704 def __getitem__(self, item): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
705 """ return an HTMLProperty instance |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
706 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
707 |
|
1073
cf30c6cdca02
More documentation.
Richard Jones <richard@users.sourceforge.net>
parents:
1068
diff
changeset
|
708 # we don't exist |
|
cf30c6cdca02
More documentation.
Richard Jones <richard@users.sourceforge.net>
parents:
1068
diff
changeset
|
709 if item == 'id': |
|
cf30c6cdca02
More documentation.
Richard Jones <richard@users.sourceforge.net>
parents:
1068
diff
changeset
|
710 return None |
|
cf30c6cdca02
More documentation.
Richard Jones <richard@users.sourceforge.net>
parents:
1068
diff
changeset
|
711 |
|
cf30c6cdca02
More documentation.
Richard Jones <richard@users.sourceforge.net>
parents:
1068
diff
changeset
|
712 # get the property |
|
2056
ba1d54edc53f
nicer invalid property error in HTML templating
Richard Jones <richard@users.sourceforge.net>
parents:
2049
diff
changeset
|
713 try: |
|
ba1d54edc53f
nicer invalid property error in HTML templating
Richard Jones <richard@users.sourceforge.net>
parents:
2049
diff
changeset
|
714 prop = self._props[item] |
|
ba1d54edc53f
nicer invalid property error in HTML templating
Richard Jones <richard@users.sourceforge.net>
parents:
2049
diff
changeset
|
715 except KeyError: |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
716 raise KeyError('No such property "%s" on %s'%(item, self.classname)) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
717 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
718 # look up the correct HTMLProperty class |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
719 for klass, htmlklass in propclasses: |
|
1104
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
720 if not isinstance(prop, klass): |
|
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
721 continue |
|
3779
ee73abcc95d2
Sorry, another mega-patch:
Richard Jones <richard@users.sourceforge.net>
parents:
3770
diff
changeset
|
722 return htmlklass(self._client, self._classname, None, prop, item, |
|
6404
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
723 None, self._anonymous) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
724 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
725 # no good |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
726 raise KeyError(item) |
| 1002 | 727 |
| 728 def __getattr__(self, attr): | |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
729 """ convenience access """ |
| 1002 | 730 try: |
| 731 return self[attr] | |
| 732 except KeyError: | |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
733 raise AttributeError(attr) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
734 |
|
1743
f166cd4fd392
add action attribute to issue.item form action tag
Richard Jones <richard@users.sourceforge.net>
parents:
1739
diff
changeset
|
735 def designator(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
736 """ Return this class' designator (classname) """ |
|
1743
f166cd4fd392
add action attribute to issue.item form action tag
Richard Jones <richard@users.sourceforge.net>
parents:
1739
diff
changeset
|
737 return self._classname |
|
f166cd4fd392
add action attribute to issue.item form action tag
Richard Jones <richard@users.sourceforge.net>
parents:
1739
diff
changeset
|
738 |
|
3860
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
739 def getItem(self, itemid, num_re=num_re): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
740 """ Get an item of this class by its item id. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
741 """ |
|
1200
0a7bd082b94a
usability improvements in API
Richard Jones <richard@users.sourceforge.net>
parents:
1183
diff
changeset
|
742 # make sure we're looking at an itemid |
|
2010
1b11ffd8015e
forward-porting of fixed edit action / parsePropsFromForm...
Richard Jones <richard@users.sourceforge.net>
parents:
2005
diff
changeset
|
743 if not isinstance(itemid, type(1)) and not num_re.match(itemid): |
|
1200
0a7bd082b94a
usability improvements in API
Richard Jones <richard@users.sourceforge.net>
parents:
1183
diff
changeset
|
744 itemid = self._klass.lookup(itemid) |
|
0a7bd082b94a
usability improvements in API
Richard Jones <richard@users.sourceforge.net>
parents:
1183
diff
changeset
|
745 |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
746 return HTMLItem(self._client, self.classname, itemid) |
|
1200
0a7bd082b94a
usability improvements in API
Richard Jones <richard@users.sourceforge.net>
parents:
1183
diff
changeset
|
747 |
|
5222
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
748 def properties(self, sort=1, cansearch=True): |
|
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
749 """ Return HTMLProperty for allowed class' properties. |
|
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
750 |
|
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
751 To return all properties call it with cansearch=False |
|
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
752 and it will return properties the user is unable to |
|
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
753 search. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
754 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
755 l = [] |
|
5222
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
756 canSearch=self._db.security.hasSearchPermission |
|
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
757 userid=self._client.userid |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
758 for name, prop in self._props.items(): |
|
5222
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
759 if cansearch and \ |
|
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
760 not canSearch(userid, self._classname, name): |
|
9bf221cebef3
Make properties method return only properties the user can search.
John Rouillard <rouilj@ieee.org>
parents:
5221
diff
changeset
|
761 continue |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
762 for klass, htmlklass in propclasses: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
763 if isinstance(prop, klass): |
|
4481
9bbf3758c16a
Allow default value declaration in DB schema.
Stefan Seefeld <stefan@seefeld.name>
parents:
4466
diff
changeset
|
764 value = prop.get_default_value() |
|
1450
7a9db3f9022a
... and a classname
Richard Jones <richard@users.sourceforge.net>
parents:
1449
diff
changeset
|
765 l.append(htmlklass(self._client, self._classname, '', |
|
4481
9bbf3758c16a
Allow default value declaration in DB schema.
Stefan Seefeld <stefan@seefeld.name>
parents:
4466
diff
changeset
|
766 prop, name, value, self._anonymous)) |
|
1633
ac5f7e5a11e5
sort HTMLClass.properties results by name (feature [SF#724738])
Richard Jones <richard@users.sourceforge.net>
parents:
1631
diff
changeset
|
767 if sort: |
|
5414
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
768 l.sort(key=lambda a:a._name) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
769 return l |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
770 |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
771 def list(self, sort_on=None): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
772 """ List all items in this class. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
773 """ |
|
1155
5cf0a6b6e787
*cough* sort list results *cough*
Richard Jones <richard@users.sourceforge.net>
parents:
1151
diff
changeset
|
774 # get the list and sort it nicely |
|
5cf0a6b6e787
*cough* sort list results *cough*
Richard Jones <richard@users.sourceforge.net>
parents:
1151
diff
changeset
|
775 l = self._klass.list() |
|
5414
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
776 keyfunc = make_key_function(self._db, self._classname, sort_on) |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
777 l.sort(key=keyfunc) |
|
1155
5cf0a6b6e787
*cough* sort list results *cough*
Richard Jones <richard@users.sourceforge.net>
parents:
1151
diff
changeset
|
778 |
|
3126
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
779 # check perms |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
780 check = self._client.db.security.hasPermission |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
781 userid = self._client.userid |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
782 if not check('Web Access', userid): |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
783 return [] |
|
3126
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
784 |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
785 l = [HTMLItem(self._client, self._classname, id) for id in l |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
786 if check('View', userid, self._classname, itemid=id)] |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
787 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
788 return l |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
789 |
|
1041
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
790 def csv(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
791 """ Return the items of this class as a chunk of CSV text. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
792 """ |
|
1041
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
793 props = self.propnames() |
|
5418
55f09ca366c4
Python 3 preparation: StringIO.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5416
diff
changeset
|
794 s = StringIO() |
|
3179
88dbe6b3d891
merge removal of rcsv
Richard Jones <richard@users.sourceforge.net>
parents:
3169
diff
changeset
|
795 writer = csv.writer(s) |
|
1767
fdaa0b751355
python2.3 CSV support, also missing thankyou in index.txt :)
Richard Jones <richard@users.sourceforge.net>
parents:
1743
diff
changeset
|
796 writer.writerow(props) |
|
4090
6f698aef2ad4
fix missed hole in the CSV editing - could still view items in the generic index editor
Richard Jones <richard@users.sourceforge.net>
parents:
4088
diff
changeset
|
797 check = self._client.db.security.hasPermission |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
798 userid = self._client.userid |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
799 if not check('Web Access', userid): |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
800 return '' |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
801 for nodeid in self._klass.list(): |
|
1041
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
802 l = [] |
|
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
803 for name in props: |
|
4090
6f698aef2ad4
fix missed hole in the CSV editing - could still view items in the generic index editor
Richard Jones <richard@users.sourceforge.net>
parents:
4088
diff
changeset
|
804 # check permission to view this property on this item |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
805 if not check('View', userid, itemid=nodeid, |
|
4090
6f698aef2ad4
fix missed hole in the CSV editing - could still view items in the generic index editor
Richard Jones <richard@users.sourceforge.net>
parents:
4088
diff
changeset
|
806 classname=self._klass.classname, property=name): |
|
6f698aef2ad4
fix missed hole in the CSV editing - could still view items in the generic index editor
Richard Jones <richard@users.sourceforge.net>
parents:
4088
diff
changeset
|
807 raise Unauthorised('view', self._klass.classname, |
|
6f698aef2ad4
fix missed hole in the CSV editing - could still view items in the generic index editor
Richard Jones <richard@users.sourceforge.net>
parents:
4088
diff
changeset
|
808 translator=self._client.translator) |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
809 value = self._klass.get(nodeid, name) |
|
1041
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
810 if value is None: |
|
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
811 l.append('') |
|
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
812 elif isinstance(value, type([])): |
|
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
813 l.append(':'.join(map(str, value))) |
|
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
814 else: |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
815 l.append(str(self._klass.get(nodeid, name))) |
|
1767
fdaa0b751355
python2.3 CSV support, also missing thankyou in index.txt :)
Richard Jones <richard@users.sourceforge.net>
parents:
1743
diff
changeset
|
816 writer.writerow(l) |
|
1041
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
817 return s.getvalue() |
|
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
818 |
|
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
819 def propnames(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
820 """ Return the list of the names of the properties of this class. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
821 """ |
|
5395
23b8e6067f7c
Python 3 preparation: update calls to dict methods.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5388
diff
changeset
|
822 idlessprops = sorted(self._klass.getprops(protected=0).keys()) |
|
1041
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
823 return ['id'] + idlessprops |
|
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
824 |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
825 def filter(self, request=None, filterspec={}, sort=[], group=[]): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
826 """ Return a list of items from this class, filtered and sorted |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
827 by the current requested filterspec/filter/sort/group args |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
828 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
829 "request" takes precedence over the other three arguments. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
830 """ |
|
4437
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
831 security = self._db.security |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
832 userid = self._client.userid |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
833 if request is not None: |
|
4437
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
834 # for a request we asume it has already been |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
835 # security-filtered |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
836 filterspec = request.filterspec |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
837 sort = request.sort |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
838 group = request.group |
|
4437
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
839 else: |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
840 cn = self.classname |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
841 filterspec = security.filterFilterspec(userid, cn, filterspec) |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
842 sort = security.filterSortspec(userid, cn, sort) |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
843 group = security.filterSortspec(userid, cn, group) |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
844 |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
845 check = security.hasPermission |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
846 if not check('Web Access', userid): |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
847 return [] |
|
3126
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
848 |
|
3198
0b7990f54778
fixed broken csv import in roundup.admin module
Richard Jones <richard@users.sourceforge.net>
parents:
3194
diff
changeset
|
849 l = [HTMLItem(self._client, self.classname, id) |
|
3126
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
850 for id in self._klass.filter(None, filterspec, sort, group) |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
851 if check('View', userid, self.classname, itemid=id)] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
852 return l |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
853 |
|
2458
c18a7d4259e3
translate labels hardcoded in HTMLClass and HTMLItem
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2411
diff
changeset
|
854 def classhelp(self, properties=None, label=''"(list)", width='500', |
|
4945
55aef7ab35a8
Increase default height of classhelp windows from 400 to 600.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4928
diff
changeset
|
855 height='600', property='', form='itemSynopsis', |
|
4783
365deccf7347
issue2550807 enhance classhelp method with ability to set html properties
John Rouillard <rouilj@ieee.org>
parents:
4750
diff
changeset
|
856 pagesize=50, inputtype="checkbox", html_kwargs={}, |
|
5336
5a81a097a394
Allow grouping of classhelp items
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5325
diff
changeset
|
857 group='', sort=None, filter=None): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
858 """Pop up a javascript window with class help |
|
2761
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
859 |
|
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
860 This generates a link to a popup window which displays the |
|
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
861 properties indicated by "properties" of the class named by |
|
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
862 "classname". The "properties" should be a comma-separated list |
|
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
863 (eg. 'id,name,description'). Properties defaults to all the |
|
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
864 properties of a class (excluding id, creator, created and |
|
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
865 activity). |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
866 |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
867 You may optionally override the label displayed, the width, |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
868 the height, the number of items per page and the field on which |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
869 the list is sorted (defaults to username if in the displayed |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
870 properties). |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
871 |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
872 With the "filter" arg it is possible to specify a filter for |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
873 which items are supposed to be displayed. It has to be of |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
874 the format "<field>=<values>;<field>=<values>;...". |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
875 |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
876 The popup window will be resizable and scrollable. |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
877 |
|
2761
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
878 If the "property" arg is given, it's passed through to the |
|
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
879 javascript help_window function. |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
880 |
|
3472
522b11d5ba8d
classhelp works with Link properties now [SF#1410290]
Richard Jones <richard@users.sourceforge.net>
parents:
3470
diff
changeset
|
881 You can use inputtype="radio" to display a radio box instead |
|
522b11d5ba8d
classhelp works with Link properties now [SF#1410290]
Richard Jones <richard@users.sourceforge.net>
parents:
3470
diff
changeset
|
882 of the default checkbox (useful for entering Link-properties) |
|
1551
9b9917b7719b
added an additional argument to help_window to allow comms back to form
Richard Jones <richard@users.sourceforge.net>
parents:
1543
diff
changeset
|
883 |
|
2827
43e3a7ac1190
fix HTMLClass.is_view_ok: permission to create new items
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2761
diff
changeset
|
884 If the "form" arg is given, it's passed through to the |
|
2761
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
885 javascript help_window function. - it's the name of the form |
|
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
886 the "property" belongs to. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
887 """ |
|
1113
a95428868bf4
Added the missing keyword/topic interface to classic template (blush)
Richard Jones <richard@users.sourceforge.net>
parents:
1104
diff
changeset
|
888 if properties is None: |
|
5395
23b8e6067f7c
Python 3 preparation: update calls to dict methods.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5388
diff
changeset
|
889 properties = sorted(self._klass.getprops(protected=0).keys()) |
|
1113
a95428868bf4
Added the missing keyword/topic interface to classic template (blush)
Richard Jones <richard@users.sourceforge.net>
parents:
1104
diff
changeset
|
890 properties = ','.join(properties) |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
891 if sort is None: |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
892 if 'username' in properties.split( ',' ): |
|
3610
1dbaa664be28
sorting of entries in classhelp popup [SF#1449000]
Richard Jones <richard@users.sourceforge.net>
parents:
3594
diff
changeset
|
893 sort = 'username' |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
894 else: |
| 4032 | 895 sort = self._klass.orderprop() |
|
3610
1dbaa664be28
sorting of entries in classhelp popup [SF#1449000]
Richard Jones <richard@users.sourceforge.net>
parents:
3594
diff
changeset
|
896 sort = '&@sort=' + sort |
|
5336
5a81a097a394
Allow grouping of classhelp items
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5325
diff
changeset
|
897 if group : |
|
5a81a097a394
Allow grouping of classhelp items
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5325
diff
changeset
|
898 group = '&@group=' + group |
|
1551
9b9917b7719b
added an additional argument to help_window to allow comms back to form
Richard Jones <richard@users.sourceforge.net>
parents:
1543
diff
changeset
|
899 if property: |
|
1853
389c4d44c73c
Replace '&' with '&' in the URLs generated by classhelp(), to validate.
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
1824
diff
changeset
|
900 property = '&property=%s'%property |
|
2761
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
901 if form: |
|
10a49678ebf2
allow listing popup to be used in query forms (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
2673
diff
changeset
|
902 form = '&form=%s'%form |
|
3472
522b11d5ba8d
classhelp works with Link properties now [SF#1410290]
Richard Jones <richard@users.sourceforge.net>
parents:
3470
diff
changeset
|
903 if inputtype: |
|
522b11d5ba8d
classhelp works with Link properties now [SF#1410290]
Richard Jones <richard@users.sourceforge.net>
parents:
3470
diff
changeset
|
904 type= '&type=%s'%inputtype |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
905 if filter: |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
906 filterprops = filter.split(';') |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
907 filtervalues = [] |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
908 names = [] |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
909 for x in filterprops: |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
910 (name, values) = x.split('=') |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
911 names.append(name) |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5399
diff
changeset
|
912 filtervalues.append('&%s=%s' % (name, urllib_.quote(values))) |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
913 filter = '&@filter=%s%s' % (','.join(names), ''.join(filtervalues)) |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
914 else: |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
915 filter = '' |
|
3169
d8d1ebd80930
fallback for (list) popups if javascript disabled (patch [SF#1101626])
Richard Jones <richard@users.sourceforge.net>
parents:
3164
diff
changeset
|
916 help_url = "%s?@startwith=0&@template=help&"\ |
|
5336
5a81a097a394
Allow grouping of classhelp items
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5325
diff
changeset
|
917 "properties=%s%s%s%s%s%s&@pagesize=%s%s" % \ |
|
3582
026adc5f1e13
fix "Adding a new constrained field to the classic schema" example in docs
Richard Jones <richard@users.sourceforge.net>
parents:
3573
diff
changeset
|
918 (self.classname, properties, property, form, type, |
|
5336
5a81a097a394
Allow grouping of classhelp items
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5325
diff
changeset
|
919 group, sort, pagesize, filter) |
|
3169
d8d1ebd80930
fallback for (list) popups if javascript disabled (patch [SF#1101626])
Richard Jones <richard@users.sourceforge.net>
parents:
3164
diff
changeset
|
920 onclick = "javascript:help_window('%s', '%s', '%s');return false;" % \ |
|
d8d1ebd80930
fallback for (list) popups if javascript disabled (patch [SF#1101626])
Richard Jones <richard@users.sourceforge.net>
parents:
3164
diff
changeset
|
921 (help_url, width, height) |
|
6215
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
922 return '<a class="classhelp" data-helpurl="%s" data-width="%s" data-height="%s" href="%s" onclick="%s" %s>%s</a>' % \ |
|
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
923 (help_url, width, height, |
|
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
924 help_url, onclick, self.cgi_escape_attrs(**html_kwargs), |
|
4783
365deccf7347
issue2550807 enhance classhelp method with ability to set html properties
John Rouillard <rouilj@ieee.org>
parents:
4750
diff
changeset
|
925 self._(label)) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
926 |
|
5991
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
927 def submit(self, label=''"Submit New Entry", action="new", html_kwargs={}): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
928 """ Generate a submit button (and action hidden element) |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
929 |
|
5991
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
930 "html_kwargs" specified additional html args for the |
|
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
931 generated html <select> |
|
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
932 |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
933 Generate nothing if we're not editable. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
934 """ |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
935 if not self.is_edit_ok(): |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
936 return '' |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
937 |
|
5907
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
938 return \ |
|
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
939 self.input(type="submit", name="submit_button", |
|
5991
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
940 value=self._(label), **html_kwargs) + \ |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
941 '\n' + \ |
|
5907
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
942 self.input(type="hidden", name="@csrf", |
|
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
943 value=anti_csrf_nonce(self._client)) + \ |
|
2983
9614a101b68f
Stuff from the train ride this morning:
Richard Jones <richard@users.sourceforge.net>
parents:
2962
diff
changeset
|
944 '\n' + \ |
|
5907
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
945 self.input(type="hidden", name="@action", value=action) |
|
999
8d54c0f3198e
Fixed history and its nihilism. Added convenience method for submit buttons
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
946 |
|
6428
32a04dc87b30
Make HTMLClass::history signature compatible to _HTMLItem::history
John Rouillard <rouilj@ieee.org>
parents:
6422
diff
changeset
|
947 def history(self, **args): |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
948 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
949 return self._('[hidden]') |
|
2466
7b248ea0a2e5
add translation to Unauthorised exception; mark missed text for translation
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2458
diff
changeset
|
950 return self._('New node - no history') |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
951 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
952 def renderWith(self, name, **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
953 """ Render this class with the given template. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
954 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
955 # create a new request and override the specified args |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
956 req = HTMLRequest(self._client) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
957 req.classname = self.classname |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
958 req.update(kwargs) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
959 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
960 # new template, using the specified classname and request |
|
4740
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
961 # [ ] this code is too similar to client.renderContext() |
|
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
962 tplname = self._client.selectTemplate(self.classname, name) |
|
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
963 pt = self._client.instance.templates.load(tplname) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
964 |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
965 # use our fabricated request |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
966 args = { |
|
4880
ca692423e401
Different approach to fix XSS in issue2550817
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4879
diff
changeset
|
967 'ok_message': self._client._ok_message, |
|
ca692423e401
Different approach to fix XSS in issue2550817
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4879
diff
changeset
|
968 'error_message': self._client._error_message |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
969 } |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
970 return pt.render(self._client, self.classname, req, **args) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
971 |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
972 class _HTMLItem(HTMLInputMixin, HTMLPermissions): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
973 """ Accesses through an *item* |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
974 """ |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
975 def __init__(self, client, classname, nodeid, anonymous=0): |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
976 self._client = client |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
977 self._db = client.db |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
978 self._classname = classname |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
979 self._nodeid = nodeid |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
980 self._klass = self._db.getclass(classname) |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
981 self._props = self._klass.getprops() |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
982 |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
983 # do we prefix the form items with the item's identification? |
|
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
984 self._anonymous = anonymous |
|
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
985 |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
986 HTMLInputMixin.__init__(self) |
|
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
987 |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
988 def is_edit_ok(self): |
|
4088
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
989 """ Is the user allowed to Edit this item? |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
990 """ |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
991 perm = self._db.security.hasPermission |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
992 return perm('Web Access', self._client.userid) and perm('Edit', |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
993 self._client.userid, self._classname, itemid=self._nodeid) |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
994 |
|
4088
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
995 def is_retire_ok(self): |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
996 """ Is the user allowed to Reture this item? |
|
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
997 """ |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
998 perm = self._db.security.hasPermission |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
999 return perm('Web Access', self._client.userid) and perm('Retire', |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1000 self._client.userid, self._classname, itemid=self._nodeid) |
|
4088
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
1001 |
|
6150
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
1002 def is_restore_ok(self): |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
1003 """ Is the user allowed to restore this item? |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
1004 """ |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
1005 perm = self._db.security.hasPermission |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
1006 return perm('Web Access', self._client.userid) and perm('Restore', |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
1007 self._client.userid, self._classname, itemid=self._nodeid) |
|
edbd4bba728a
Add 'is_restore_ok' method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6125
diff
changeset
|
1008 |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1009 def is_view_ok(self): |
|
4088
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
1010 """ Is the user allowed to View this item? |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1011 """ |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1012 perm = self._db.security.hasPermission |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1013 if perm('Web Access', self._client.userid) and perm('View', |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1014 self._client.userid, self._classname, itemid=self._nodeid): |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1015 return 1 |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1016 return self.is_edit_ok() |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1017 |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1018 def is_only_view_ok(self): |
|
4088
34434785f308
Plug a number of security holes:
Richard Jones <richard@users.sourceforge.net>
parents:
4058
diff
changeset
|
1019 """ Is the user only allowed to View (ie. not Edit) this item? |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1020 """ |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1021 return self.is_view_ok() and not self.is_edit_ok() |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1022 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1023 def __repr__(self): |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1024 return '<HTMLItem(0x%x) %s %s>'%(id(self), self._classname, |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1025 self._nodeid) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1026 |
| 1002 | 1027 def __getitem__(self, item): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1028 """ return an HTMLProperty instance |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1029 this now can handle transitive lookups where item is of the |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1030 form x.y.z |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1031 """ |
| 1002 | 1032 if item == 'id': |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1033 return self._nodeid |
|
1073
cf30c6cdca02
More documentation.
Richard Jones <richard@users.sourceforge.net>
parents:
1068
diff
changeset
|
1034 |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1035 items = item.split('.', 1) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1036 has_rest = len(items) > 1 |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1037 |
|
1073
cf30c6cdca02
More documentation.
Richard Jones <richard@users.sourceforge.net>
parents:
1068
diff
changeset
|
1038 # get the property |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1039 prop = self._props[items[0]] |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1040 |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1041 if has_rest and not isinstance(prop, (hyperdb.Link, hyperdb.Multilink)): |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
1042 raise KeyError(item) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1043 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1044 # get the value, handling missing values |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
1045 value = None |
|
6398
26e5c42f148c
issue2551078 - Fix traceback caused when putting two id's into a Link html field.
John Rouillard <rouilj@ieee.org>
parents:
6377
diff
changeset
|
1046 try: |
|
26e5c42f148c
issue2551078 - Fix traceback caused when putting two id's into a Link html field.
John Rouillard <rouilj@ieee.org>
parents:
6377
diff
changeset
|
1047 if int(self._nodeid) > 0: |
|
26e5c42f148c
issue2551078 - Fix traceback caused when putting two id's into a Link html field.
John Rouillard <rouilj@ieee.org>
parents:
6377
diff
changeset
|
1048 value = self._klass.get(self._nodeid, items[0], None) |
|
26e5c42f148c
issue2551078 - Fix traceback caused when putting two id's into a Link html field.
John Rouillard <rouilj@ieee.org>
parents:
6377
diff
changeset
|
1049 except ValueError: |
|
26e5c42f148c
issue2551078 - Fix traceback caused when putting two id's into a Link html field.
John Rouillard <rouilj@ieee.org>
parents:
6377
diff
changeset
|
1050 value = self._nodeid |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1051 if value is None: |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1052 if isinstance(prop, hyperdb.Multilink): |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1053 value = [] |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1054 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1055 # look up the correct HTMLProperty class |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1056 htmlprop = None |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1057 for klass, htmlklass in propclasses: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1058 if isinstance(prop, klass): |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1059 htmlprop = htmlklass(self._client, self._classname, |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1060 self._nodeid, prop, items[0], value, self._anonymous) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1061 if htmlprop is not None: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1062 if has_rest: |
|
3699
976191d749fb
grouping by ID and grouping by transitive multilinks didn't work correctly.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3698
diff
changeset
|
1063 if isinstance(htmlprop, MultilinkHTMLProperty): |
|
976191d749fb
grouping by ID and grouping by transitive multilinks didn't work correctly.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3698
diff
changeset
|
1064 return [h[items[1]] for h in htmlprop] |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1065 return htmlprop[items[1]] |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
1066 return htmlprop |
| 1002 | 1067 |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
1068 raise KeyError(item) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1069 |
| 1002 | 1070 def __getattr__(self, attr): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1071 """ convenience access to properties """ |
| 1002 | 1072 try: |
| 1073 return self[attr] | |
| 1074 except KeyError: | |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
1075 raise AttributeError(attr) |
|
1743
f166cd4fd392
add action attribute to issue.item form action tag
Richard Jones <richard@users.sourceforge.net>
parents:
1739
diff
changeset
|
1076 |
|
f166cd4fd392
add action attribute to issue.item form action tag
Richard Jones <richard@users.sourceforge.net>
parents:
1739
diff
changeset
|
1077 def designator(self): |
|
2014
366d3bbce982
Simple version of collision detection...
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
2010
diff
changeset
|
1078 """Return this item's designator (classname + id).""" |
|
1743
f166cd4fd392
add action attribute to issue.item form action tag
Richard Jones <richard@users.sourceforge.net>
parents:
1739
diff
changeset
|
1079 return '%s%s'%(self._classname, self._nodeid) |
|
2136
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
2118
diff
changeset
|
1080 |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
2118
diff
changeset
|
1081 def is_retired(self): |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
2118
diff
changeset
|
1082 """Is this item retired?""" |
|
ee3cf6a44f29
queries on a per-user basis, and public queries [SF#891798] :)
Richard Jones <richard@users.sourceforge.net>
parents:
2118
diff
changeset
|
1083 return self._klass.is_retired(self._nodeid) |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
1084 |
|
5991
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
1085 def submit(self, label=''"Submit Changes", action="edit", html_kwargs={}): |
|
2014
366d3bbce982
Simple version of collision detection...
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
2010
diff
changeset
|
1086 """Generate a submit button. |
|
366d3bbce982
Simple version of collision detection...
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
2010
diff
changeset
|
1087 |
|
5991
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
1088 "html_kwargs" specified additional html args for the |
|
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
1089 generated html <select> |
|
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
1090 |
|
2014
366d3bbce982
Simple version of collision detection...
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
2010
diff
changeset
|
1091 Also sneak in the lastactivity and action hidden elements. |
|
366d3bbce982
Simple version of collision detection...
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
2010
diff
changeset
|
1092 """ |
|
5907
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
1093 return \ |
|
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
1094 self.input(type="submit", name="submit_button", |
|
5991
b0940ad50f43
issue2551075 Update jinja template to bootstrap 4.
John Rouillard <rouilj@ieee.org>
parents:
5988
diff
changeset
|
1095 value=self._(label), **html_kwargs) + \ |
|
5907
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
1096 '\n' + \ |
|
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
1097 self.input(type="hidden", name="@lastactivity", |
|
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
1098 value=self.activity.local(0)) + \ |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
1099 '\n' + \ |
|
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
1100 self.input(type="hidden", name="@csrf", |
|
5488
52cb53eedf77
reworked random number use
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5485
diff
changeset
|
1101 value=anti_csrf_nonce(self._client)) + \ |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
1102 '\n' + \ |
|
5907
fe96015445e9
Reorder html entities generated by submit button
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5903
diff
changeset
|
1103 self.input(type="hidden", name="@action", value=action) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1104 |
|
1103
db787cef1385
handled some XXXs
Richard Jones <richard@users.sourceforge.net>
parents:
1099
diff
changeset
|
1105 def journal(self, direction='descending'): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1106 """ Return a list of HTMLJournalEntry instances. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1107 """ |
|
1103
db787cef1385
handled some XXXs
Richard Jones <richard@users.sourceforge.net>
parents:
1099
diff
changeset
|
1108 # XXX do this |
|
db787cef1385
handled some XXXs
Richard Jones <richard@users.sourceforge.net>
parents:
1099
diff
changeset
|
1109 return [] |
|
db787cef1385
handled some XXXs
Richard Jones <richard@users.sourceforge.net>
parents:
1099
diff
changeset
|
1110 |
| 5809 | 1111 def history(self, direction='descending', dre=re.compile(r'^\d+$'), |
|
5112
8901cc4ef0e0
- issue1714899: Feature Request: Optional Change Note. Added a new
John Rouillard <rouilj@ieee.org>
parents:
5095
diff
changeset
|
1112 limit=None, showall=False ): |
|
8901cc4ef0e0
- issue1714899: Feature Request: Optional Change Note. Added a new
John Rouillard <rouilj@ieee.org>
parents:
5095
diff
changeset
|
1113 """Create an html view of the journal for the item. |
|
8901cc4ef0e0
- issue1714899: Feature Request: Optional Change Note. Added a new
John Rouillard <rouilj@ieee.org>
parents:
5095
diff
changeset
|
1114 |
|
8901cc4ef0e0
- issue1714899: Feature Request: Optional Change Note. Added a new
John Rouillard <rouilj@ieee.org>
parents:
5095
diff
changeset
|
1115 Display property changes for all properties that does not have quiet set. |
|
8901cc4ef0e0
- issue1714899: Feature Request: Optional Change Note. Added a new
John Rouillard <rouilj@ieee.org>
parents:
5095
diff
changeset
|
1116 If showall=True then all properties regardless of quiet setting will be |
|
8901cc4ef0e0
- issue1714899: Feature Request: Optional Change Note. Added a new
John Rouillard <rouilj@ieee.org>
parents:
5095
diff
changeset
|
1117 shown. |
|
8901cc4ef0e0
- issue1714899: Feature Request: Optional Change Note. Added a new
John Rouillard <rouilj@ieee.org>
parents:
5095
diff
changeset
|
1118 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
1119 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
1120 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1121 |
|
6422
91ae685405ba
- issue2550964 - History can (temporarily) show incorrect value...
John Rouillard <rouilj@ieee.org>
parents:
6421
diff
changeset
|
1122 # history should only use database values not current |
|
91ae685405ba
- issue2550964 - History can (temporarily) show incorrect value...
John Rouillard <rouilj@ieee.org>
parents:
6421
diff
changeset
|
1123 # form values. Disable form_wins for the body of the |
|
91ae685405ba
- issue2550964 - History can (temporarily) show incorrect value...
John Rouillard <rouilj@ieee.org>
parents:
6421
diff
changeset
|
1124 # function. Reset it to original value on return. |
|
91ae685405ba
- issue2550964 - History can (temporarily) show incorrect value...
John Rouillard <rouilj@ieee.org>
parents:
6421
diff
changeset
|
1125 orig_form_wins = self._client.form_wins |
|
91ae685405ba
- issue2550964 - History can (temporarily) show incorrect value...
John Rouillard <rouilj@ieee.org>
parents:
6421
diff
changeset
|
1126 self._client.form_wins = False |
|
91ae685405ba
- issue2550964 - History can (temporarily) show incorrect value...
John Rouillard <rouilj@ieee.org>
parents:
6421
diff
changeset
|
1127 |
|
2614
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1128 # get the journal, sort and reverse |
|
5232
462b0f76fce8
issue2550864 - Potential information leakage via journal/history
John Rouillard <rouilj@ieee.org>
parents:
5222
diff
changeset
|
1129 history = self._klass.history(self._nodeid, skipquiet=(not showall)) |
|
5448
754be676ccc8
set key for history sort to avoid sorting history args (could be a dict)
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5440
diff
changeset
|
1130 history.sort(key=lambda a: a[:3]) |
|
2614
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1131 history.reverse() |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1132 |
|
4233
01ef28bffcbd
don't show entire history by default
Richard Jones <richard@users.sourceforge.net>
parents:
4146
diff
changeset
|
1133 # restrict the volume |
|
01ef28bffcbd
don't show entire history by default
Richard Jones <richard@users.sourceforge.net>
parents:
4146
diff
changeset
|
1134 if limit: |
|
01ef28bffcbd
don't show entire history by default
Richard Jones <richard@users.sourceforge.net>
parents:
4146
diff
changeset
|
1135 history = history[:limit] |
|
01ef28bffcbd
don't show entire history by default
Richard Jones <richard@users.sourceforge.net>
parents:
4146
diff
changeset
|
1136 |
|
1402
27586da5557c
Added users' timezone support
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1394
diff
changeset
|
1137 timezone = self._db.getUserTimezone() |
|
2614
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1138 l = [] |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1139 current = {} |
|
2614
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1140 comments = {} |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1141 for id, evt_date, user, action, args in history: |
|
1402
27586da5557c
Added users' timezone support
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1394
diff
changeset
|
1142 date_s = str(evt_date.local(timezone)).replace("."," ") |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1143 arg_s = '' |
|
5232
462b0f76fce8
issue2550864 - Potential information leakage via journal/history
John Rouillard <rouilj@ieee.org>
parents:
5222
diff
changeset
|
1144 if action in ['link', 'unlink'] and type(args) == type(()): |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1145 if len(args) == 3: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1146 linkcl, linkid, key = args |
|
5684
97e2125e064c
When we generate links from URL's in messages, we add rel="nofollow"
John Rouillard <rouilj@ieee.org>
parents:
5548
diff
changeset
|
1147 arg_s += '<a rel="nofollow noopener" href="%s%s">%s%s %s</a>'%(linkcl, linkid, |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1148 linkcl, linkid, key) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1149 else: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1150 arg_s = str(args) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1151 elif type(args) == type({}): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1152 cell = [] |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1153 for k in args.keys(): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1154 # try to get the relevant property and treat it |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1155 # specially |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1156 try: |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1157 prop = self._props[k] |
|
999
8d54c0f3198e
Fixed history and its nihilism. Added convenience method for submit buttons
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
1158 except KeyError: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1159 prop = None |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1160 if prop is None: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1161 # property no longer exists |
|
2396
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
1162 comments['no_exist'] = self._( |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
1163 "<em>The indicated property no longer exists</em>") |
|
2396
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
1164 cell.append(self._('<em>%s: %s</em>\n') |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1165 % (self._(k), str(args[k]))) |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1166 continue |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1167 |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1168 # load the current state for the property (if we |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1169 # haven't already) |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1170 if k not in current: |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1171 val = self[k] |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1172 if not isinstance(val, HTMLProperty): |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1173 current[k] = None |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1174 else: |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1175 current[k] = val.plain(escape=1) |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1176 # make link if hrefable |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1177 if (isinstance(prop, hyperdb.Link)): |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1178 classname = prop.classname |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1179 try: |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1180 template = self._client.selectTemplate(classname, 'item') |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1181 if template.startswith('_generic.'): |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1182 raise NoTemplate('not really...') |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1183 except NoTemplate: |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1184 pass |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1185 else: |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1186 linkid = self._klass.get(self._nodeid, k, None) |
|
5684
97e2125e064c
When we generate links from URL's in messages, we add rel="nofollow"
John Rouillard <rouilj@ieee.org>
parents:
5548
diff
changeset
|
1187 current[k] = '<a rel="nofollow noopener" href="%s%s">%s</a>'%( |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1188 classname, linkid, current[k]) |
|
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1189 |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1190 if args[k] and (isinstance(prop, hyperdb.Multilink) or |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1191 isinstance(prop, hyperdb.Link)): |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1192 # figure what the link class is |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1193 classname = prop.classname |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1194 try: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1195 linkcl = self._db.getclass(classname) |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1196 except KeyError: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1197 labelprop = None |
|
2396
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
1198 comments[classname] = self._( |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
1199 "The linked class %(classname)s no longer exists" |
|
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
1200 ) % locals() |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1201 labelprop = linkcl.labelprop(1) |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1202 try: |
|
4740
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
1203 template = self._client.selectTemplate(classname, |
|
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
1204 'item') |
|
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
1205 if template.startswith('_generic.'): |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
1206 raise NoTemplate('not really...') |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1207 hrefable = 1 |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1208 except NoTemplate: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1209 hrefable = 0 |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1210 |
|
5232
462b0f76fce8
issue2550864 - Potential information leakage via journal/history
John Rouillard <rouilj@ieee.org>
parents:
5222
diff
changeset
|
1211 if isinstance(prop, hyperdb.Multilink) and args[k]: |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1212 ml = [] |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1213 for linkid in args[k]: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1214 if isinstance(linkid, type(())): |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1215 sublabel = linkid[0] + ' ' |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1216 linkids = linkid[1] |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1217 else: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1218 sublabel = '' |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1219 linkids = [linkid] |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1220 subml = [] |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1221 for linkid in linkids: |
|
5325
7c7f3faa5e10
Check for None linkid in history
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5319
diff
changeset
|
1222 # We're seeing things like |
|
7c7f3faa5e10
Check for None linkid in history
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5319
diff
changeset
|
1223 # {'nosy':['38', '113', None, '82']} in the wild |
|
7c7f3faa5e10
Check for None linkid in history
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5319
diff
changeset
|
1224 if linkid is None : |
|
7c7f3faa5e10
Check for None linkid in history
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5319
diff
changeset
|
1225 continue |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1226 label = classname + linkid |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1227 # if we have a label property, try to use it |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1228 # TODO: test for node existence even when |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1229 # there's no labelprop! |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1230 try: |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1231 if labelprop is not None and \ |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1232 labelprop != 'id': |
|
6620
b7093aa16895
issue2551196 - Unset labelprop of a Multilink can lead to Python error when using context/history
John Rouillard <rouilj@ieee.org>
parents:
6593
diff
changeset
|
1233 label = linkcl.get(linkid, labelprop, |
|
b7093aa16895
issue2551196 - Unset labelprop of a Multilink can lead to Python error when using context/history
John Rouillard <rouilj@ieee.org>
parents:
6593
diff
changeset
|
1234 default=self._( |
|
b7093aa16895
issue2551196 - Unset labelprop of a Multilink can lead to Python error when using context/history
John Rouillard <rouilj@ieee.org>
parents:
6593
diff
changeset
|
1235 "[label is missing]")) |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1236 label = html_escape(label) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1237 except IndexError: |
|
2396
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
1238 comments['no_link'] = self._( |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
1239 "<strike>The linked node" |
|
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
1240 " no longer exists</strike>") |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1241 subml.append('<strike>%s</strike>'%label) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1242 else: |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1243 if hrefable: |
|
5684
97e2125e064c
When we generate links from URL's in messages, we add rel="nofollow"
John Rouillard <rouilj@ieee.org>
parents:
5548
diff
changeset
|
1244 subml.append('<a rel="nofollow noopener" ' |
|
5325
7c7f3faa5e10
Check for None linkid in history
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5319
diff
changeset
|
1245 'href="%s%s">%s</a>'%( |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1246 classname, linkid, label)) |
|
3401
62e4032cb280
merge from maint-0-8
Richard Jones <richard@users.sourceforge.net>
parents:
3394
diff
changeset
|
1247 elif label is None: |
|
62e4032cb280
merge from maint-0-8
Richard Jones <richard@users.sourceforge.net>
parents:
3394
diff
changeset
|
1248 subml.append('%s%s'%(classname, |
|
62e4032cb280
merge from maint-0-8
Richard Jones <richard@users.sourceforge.net>
parents:
3394
diff
changeset
|
1249 linkid)) |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1250 else: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1251 subml.append(label) |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1252 ml.append(sublabel + ', '.join(subml)) |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1253 cell.append('%s:\n %s'%(self._(k), ', '.join(ml))) |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1254 elif isinstance(prop, hyperdb.Link) and args[k]: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1255 label = classname + args[k] |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1256 # if we have a label property, try to use it |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1257 # TODO: test for node existence even when |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1258 # there's no labelprop! |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1259 if labelprop is not None and labelprop != 'id': |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1260 try: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1261 label = html_escape(linkcl.get(args[k], |
|
6620
b7093aa16895
issue2551196 - Unset labelprop of a Multilink can lead to Python error when using context/history
John Rouillard <rouilj@ieee.org>
parents:
6593
diff
changeset
|
1262 labelprop, default=self._( |
|
b7093aa16895
issue2551196 - Unset labelprop of a Multilink can lead to Python error when using context/history
John Rouillard <rouilj@ieee.org>
parents:
6593
diff
changeset
|
1263 "[label is missing]"))) |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1264 except IndexError: |
|
2396
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
1265 comments['no_link'] = self._( |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
1266 "<strike>The linked node" |
|
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
1267 " no longer exists</strike>") |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1268 cell.append(' <strike>%s</strike>,\n'%label) |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1269 # "flag" this is done .... euwww |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1270 label = None |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1271 if label is not None: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1272 if hrefable: |
|
6542
58bd05fbf350
Replace bad ref= attr with rel= on a tag in history.
John Rouillard <rouilj@ieee.org>
parents:
6444
diff
changeset
|
1273 old = '<a rel="nofollow noopener" href="%s%s">%s</a>'%(classname, |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
1274 args[k], label) |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1275 else: |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1276 old = label; |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1277 cell.append('%s: %s' % (self._(k), old)) |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1278 if k in current and current[k] is not None: |
|
1364
1d1ee96e8956
applied patch for nicer history display (feature [SF#638280])
Richard Jones <richard@users.sourceforge.net>
parents:
1357
diff
changeset
|
1279 cell[-1] += ' -> %s'%current[k] |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1280 current[k] = old |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1281 |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1282 elif isinstance(prop, hyperdb.Date) and args[k]: |
|
3151
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
1283 if args[k] is None: |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
1284 d = '' |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
1285 else: |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
1286 d = date.Date(args[k], |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
1287 translator=self._client).local(timezone) |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1288 cell.append('%s: %s'%(self._(k), str(d))) |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1289 if k in current and current[k] is not None: |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1290 cell[-1] += ' -> %s' % current[k] |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1291 current[k] = str(d) |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1292 |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1293 elif isinstance(prop, hyperdb.Interval) and args[k]: |
|
2524
736115d374f2
use client instance to translate Date and Interval objects
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2520
diff
changeset
|
1294 val = str(date.Interval(args[k], |
|
736115d374f2
use client instance to translate Date and Interval objects
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2520
diff
changeset
|
1295 translator=self._client)) |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1296 cell.append('%s: %s'%(self._(k), val)) |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1297 if k in current and current[k] is not None: |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1298 cell[-1] += ' -> %s'%current[k] |
|
2170
0def552122af
handle Boolean values in history HTML display
Richard Jones <richard@users.sourceforge.net>
parents:
2157
diff
changeset
|
1299 current[k] = val |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1300 |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1301 elif isinstance(prop, hyperdb.String) and args[k]: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1302 val = html_escape(args[k]) |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1303 cell.append('%s: %s'%(self._(k), val)) |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1304 if k in current and current[k] is not None: |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1305 cell[-1] += ' -> %s'%current[k] |
|
2170
0def552122af
handle Boolean values in history HTML display
Richard Jones <richard@users.sourceforge.net>
parents:
2157
diff
changeset
|
1306 current[k] = val |
|
0def552122af
handle Boolean values in history HTML display
Richard Jones <richard@users.sourceforge.net>
parents:
2157
diff
changeset
|
1307 |
|
0def552122af
handle Boolean values in history HTML display
Richard Jones <richard@users.sourceforge.net>
parents:
2157
diff
changeset
|
1308 elif isinstance(prop, hyperdb.Boolean) and args[k] is not None: |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1309 val = args[k] and ''"Yes" or ''"No" |
|
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1310 cell.append('%s: %s'%(self._(k), val)) |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1311 if k in current and current[k] is not None: |
|
2170
0def552122af
handle Boolean values in history HTML display
Richard Jones <richard@users.sourceforge.net>
parents:
2157
diff
changeset
|
1312 cell[-1] += ' -> %s'%current[k] |
|
0def552122af
handle Boolean values in history HTML display
Richard Jones <richard@users.sourceforge.net>
parents:
2157
diff
changeset
|
1313 current[k] = val |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1314 |
|
4483
22bc0426e348
Second patch from issue2550688 -- with some changes:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4481
diff
changeset
|
1315 elif isinstance(prop, hyperdb.Password) and args[k] is not None: |
|
22bc0426e348
Second patch from issue2550688 -- with some changes:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4481
diff
changeset
|
1316 val = args[k].dummystr() |
|
22bc0426e348
Second patch from issue2550688 -- with some changes:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4481
diff
changeset
|
1317 cell.append('%s: %s'%(self._(k), val)) |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1318 if k in current and current[k] is not None: |
|
4483
22bc0426e348
Second patch from issue2550688 -- with some changes:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4481
diff
changeset
|
1319 cell[-1] += ' -> %s'%current[k] |
|
22bc0426e348
Second patch from issue2550688 -- with some changes:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4481
diff
changeset
|
1320 current[k] = val |
|
22bc0426e348
Second patch from issue2550688 -- with some changes:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4481
diff
changeset
|
1321 |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1322 elif not args[k]: |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1323 if k in current and current[k] is not None: |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1324 cell.append('%s: %s'%(self._(k), current[k])) |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1325 current[k] = '(no value)' |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1326 else: |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1327 cell.append(self._('%s: (no value)')%self._(k)) |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1328 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1329 else: |
|
2547
9b9c8fb52732
translate action names and property names in the history list
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2538
diff
changeset
|
1330 cell.append('%s: %s'%(self._(k), str(args[k]))) |
|
5492
6b0c542642be
blobfiles now always stores/returns bytes
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5488
diff
changeset
|
1331 if k in current and current[k] is not None: |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1332 cell[-1] += ' -> %s'%current[k] |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1333 current[k] = str(args[k]) |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1334 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1335 arg_s = '<br />'.join(cell) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1336 else: |
|
5947
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1337 if action in ( 'retired', 'restored' ): |
|
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1338 # args = None for these actions |
|
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1339 pass |
|
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1340 else: |
|
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1341 # unknown event!! |
|
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1342 comments['unknown'] = self._( |
|
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1343 "<strong><em>This event %s is not handled" |
|
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1344 " by the history display!</em></strong>"%action) |
|
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1345 arg_s = '<strong><em>' + str(args) + '</em></strong>' |
|
33914dd1160f
Retired and Restored were unhandled by history.
John Rouillard <rouilj@ieee.org>
parents:
5927
diff
changeset
|
1346 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1347 date_s = date_s.replace(' ', ' ') |
|
1258
de0f879f995d
fixed history to display username instead of userid
Richard Jones <richard@users.sourceforge.net>
parents:
1254
diff
changeset
|
1348 # if the user's an itemid, figure the username (older journals |
|
de0f879f995d
fixed history to display username instead of userid
Richard Jones <richard@users.sourceforge.net>
parents:
1254
diff
changeset
|
1349 # have the username) |
|
de0f879f995d
fixed history to display username instead of userid
Richard Jones <richard@users.sourceforge.net>
parents:
1254
diff
changeset
|
1350 if dre.match(user): |
|
de0f879f995d
fixed history to display username instead of userid
Richard Jones <richard@users.sourceforge.net>
parents:
1254
diff
changeset
|
1351 user = self._db.user.get(user, 'username') |
|
1074
954ad22eb7d9
more doc, more cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1073
diff
changeset
|
1352 l.append('<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>'%( |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1353 date_s, html_escape(user), self._(action), arg_s)) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1354 if comments: |
|
2396
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
1355 l.append(self._( |
|
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
1356 '<tr><td colspan=4><strong>Note:</strong></td></tr>')) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1357 for entry in comments.values(): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1358 l.append('<tr><td colspan=4>%s</td></tr>'%entry) |
|
2614
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1359 |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1360 if direction == 'ascending': |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1361 l.reverse() |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1362 |
|
4696
57a64e591a00
Use bootstrap classes for displaying tables; bug.item is almost table free and uses bootstrap form classes and markup
Pradip Caulagi <caulagi@gmail.com>
parents:
4651
diff
changeset
|
1363 l[0:0] = ['<table class="history table table-condensed table-striped">' |
|
2614
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1364 '<tr><th colspan="4" class="header">', |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1365 self._('History'), |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1366 '</th></tr><tr>', |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1367 self._('<th>Date</th>'), |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1368 self._('<th>User</th>'), |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1369 self._('<th>Action</th>'), |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1370 self._('<th>Args</th>'), |
|
c64ea31a569b
merge from HEAD, with some additional code re-arranging
Richard Jones <richard@users.sourceforge.net>
parents:
2591
diff
changeset
|
1371 '</tr>'] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1372 l.append('</table>') |
|
6422
91ae685405ba
- issue2550964 - History can (temporarily) show incorrect value...
John Rouillard <rouilj@ieee.org>
parents:
6421
diff
changeset
|
1373 |
|
91ae685405ba
- issue2550964 - History can (temporarily) show incorrect value...
John Rouillard <rouilj@ieee.org>
parents:
6421
diff
changeset
|
1374 self._client.form_wins = orig_form_wins |
|
91ae685405ba
- issue2550964 - History can (temporarily) show incorrect value...
John Rouillard <rouilj@ieee.org>
parents:
6421
diff
changeset
|
1375 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1376 return '\n'.join(l) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1377 |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
1378 def renderQueryForm(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1379 """ Render this item, which is a query, as a search form. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1380 """ |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
1381 # create a new request and override the specified args |
|
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
1382 req = HTMLRequest(self._client) |
|
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
1383 req.classname = self._klass.get(self._nodeid, 'klass') |
|
1284
899c6ced2abe
include queryname in query template render ;)
Richard Jones <richard@users.sourceforge.net>
parents:
1272
diff
changeset
|
1384 name = self._klass.get(self._nodeid, 'name') |
|
899c6ced2abe
include queryname in query template render ;)
Richard Jones <richard@users.sourceforge.net>
parents:
1272
diff
changeset
|
1385 req.updateFromURL(self._klass.get(self._nodeid, 'url') + |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5399
diff
changeset
|
1386 '&@queryname=%s'%urllib_.quote(name)) |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
1387 |
|
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
1388 # new template, using the specified classname and request |
|
4740
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
1389 # [ ] the custom logic for search page doesn't belong to |
|
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
1390 # generic templating module (techtonik) |
|
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
1391 tplname = self._client.selectTemplate(req.classname, 'search') |
|
fe9568a6cbd6
Untangle template selection logic from template loading functionality.
anatoly techtonik <techtonik@gmail.com>
parents:
4737
diff
changeset
|
1392 pt = self._client.instance.templates.load(tplname) |
|
4057
885069b5f328
Fix context for query form to be a class.
Stefan Seefeld <stefan@seefeld.name>
parents:
4056
diff
changeset
|
1393 # The context for a search page should be the class, not any |
|
885069b5f328
Fix context for query form to be a class.
Stefan Seefeld <stefan@seefeld.name>
parents:
4056
diff
changeset
|
1394 # node. |
|
885069b5f328
Fix context for query form to be a class.
Stefan Seefeld <stefan@seefeld.name>
parents:
4056
diff
changeset
|
1395 self._client.nodeid = None |
|
4115
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
1396 |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
1397 # use our fabricated request |
|
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
1398 return pt.render(self._client, req.classname, req) |
|
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
1399 |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
1400 def download_url(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1401 """ Assume that this item is a FileClass and that it has a name |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
1402 and content. Construct a URL for the download of the content. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1403 """ |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
1404 name = self._klass.get(self._nodeid, 'name') |
|
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
1405 url = '%s%s/%s'%(self._classname, self._nodeid, name) |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5399
diff
changeset
|
1406 return urllib_.quote(url) |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
1407 |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1408 def copy_url(self, exclude=("messages", "files")): |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1409 """Construct a URL for creating a copy of this item |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1410 |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1411 "exclude" is an optional list of properties that should |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1412 not be copied to the new object. By default, this list |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1413 includes "messages" and "files" properties. Note that |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1414 "id" property cannot be copied. |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1415 |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1416 """ |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1417 exclude = ("id", "activity", "actor", "creation", "creator") \ |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1418 + tuple(exclude) |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1419 query = { |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1420 "@template": "item", |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1421 "@note": self._("Copy of %(class)s %(id)s") % { |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1422 "class": self._(self._classname), "id": self._nodeid}, |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1423 } |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1424 for name in self._props.keys(): |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1425 if name not in exclude: |
|
4839
c317147fd891
Fix copy_url to properly support properties that are mutlilinks.
John Rouillard <rouilj@ieee.org>
parents:
4804
diff
changeset
|
1426 prop = self._props[name] |
|
c317147fd891
Fix copy_url to properly support properties that are mutlilinks.
John Rouillard <rouilj@ieee.org>
parents:
4804
diff
changeset
|
1427 if not isinstance(prop, hyperdb.Multilink): |
|
c317147fd891
Fix copy_url to properly support properties that are mutlilinks.
John Rouillard <rouilj@ieee.org>
parents:
4804
diff
changeset
|
1428 query[name] = self[name].plain() |
|
c317147fd891
Fix copy_url to properly support properties that are mutlilinks.
John Rouillard <rouilj@ieee.org>
parents:
4804
diff
changeset
|
1429 else: |
|
c317147fd891
Fix copy_url to properly support properties that are mutlilinks.
John Rouillard <rouilj@ieee.org>
parents:
4804
diff
changeset
|
1430 query[name] = ",".join(self._klass.get(self._nodeid, name)) |
|
c317147fd891
Fix copy_url to properly support properties that are mutlilinks.
John Rouillard <rouilj@ieee.org>
parents:
4804
diff
changeset
|
1431 |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1432 return self._classname + "?" + "&".join( |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5399
diff
changeset
|
1433 ["%s=%s" % (key, urllib_.quote(value)) |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1434 for key, value in query.items()]) |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1435 |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1436 class _HTMLUser(_HTMLItem): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1437 """Add ability to check for permissions on users. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1438 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1439 _marker = [] |
|
2991
b9a55628a78d
more doc fixes
Richard Jones <richard@users.sourceforge.net>
parents:
2983
diff
changeset
|
1440 def hasPermission(self, permission, classname=_marker, |
|
b9a55628a78d
more doc fixes
Richard Jones <richard@users.sourceforge.net>
parents:
2983
diff
changeset
|
1441 property=None, itemid=None): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1442 """Determine if the user has the Permission. |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1443 |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1444 The class being tested defaults to the template's class, but may |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1445 be overidden for this test by suppling an alternate classname. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1446 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1447 if classname is self._marker: |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1448 classname = self._client.classname |
|
3535
75dc225613cc
fix security check for hasPermission(Permission, None)
Richard Jones <richard@users.sourceforge.net>
parents:
3509
diff
changeset
|
1449 return self._db.security.hasPermission(permission, |
|
3357
5c8822d10fdc
fix invocation of hasPermission from templating code [SF#1224172]
Richard Jones <richard@users.sourceforge.net>
parents:
3354
diff
changeset
|
1450 self._nodeid, classname, property, itemid) |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1451 |
|
4306
966592263fb8
Clean up all the places where role processing occurs.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4288
diff
changeset
|
1452 def hasRole(self, *rolenames): |
|
966592263fb8
Clean up all the places where role processing occurs.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4288
diff
changeset
|
1453 """Determine whether the user has any role in rolenames.""" |
|
966592263fb8
Clean up all the places where role processing occurs.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4288
diff
changeset
|
1454 return self._db.user.has_role(self._nodeid, *rolenames) |
|
3535
75dc225613cc
fix security check for hasPermission(Permission, None)
Richard Jones <richard@users.sourceforge.net>
parents:
3509
diff
changeset
|
1455 |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1456 def HTMLItem(client, classname, nodeid, anonymous=0): |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1457 if classname == 'user': |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1458 return _HTMLUser(client, classname, nodeid, anonymous) |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1459 else: |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1460 return _HTMLItem(client, classname, nodeid, anonymous) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1461 |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1462 class HTMLProperty(HTMLInputMixin, HTMLPermissions): |
|
5067
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1463 """ String, Integer, Number, Date, Interval HTMLProperty |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1464 |
|
1123
644d3075c2df
more documentation, fixed bug in request/description
Richard Jones <richard@users.sourceforge.net>
parents:
1122
diff
changeset
|
1465 Has useful attributes: |
|
1080
24c9e81fce85
bugfix, added some doc
Richard Jones <richard@users.sourceforge.net>
parents:
1079
diff
changeset
|
1466 |
|
24c9e81fce85
bugfix, added some doc
Richard Jones <richard@users.sourceforge.net>
parents:
1079
diff
changeset
|
1467 _name the name of the property |
|
24c9e81fce85
bugfix, added some doc
Richard Jones <richard@users.sourceforge.net>
parents:
1079
diff
changeset
|
1468 _value the value of the property if any |
|
24c9e81fce85
bugfix, added some doc
Richard Jones <richard@users.sourceforge.net>
parents:
1079
diff
changeset
|
1469 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1470 A wrapper object which may be stringified for the plain() behaviour. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1471 """ |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
1472 def __init__(self, client, classname, nodeid, prop, name, value, |
|
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
1473 anonymous=0): |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1474 self._client = client |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1475 self._db = client.db |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
1476 self._ = client._ |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
1477 self._classname = classname |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1478 self._nodeid = nodeid |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1479 self._prop = prop |
|
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1480 self._value = value |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
1481 self._anonymous = anonymous |
|
1468
f57759a5ee1a
Better form name mangling, doesn't confuse other things like generic editing.
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1482 self._name = name |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
1483 if not anonymous: |
|
4286
f364978e6e3f
Do not create bogus non-anonymous objects.
Stefan Seefeld <stefan@seefeld.name>
parents:
4268
diff
changeset
|
1484 if nodeid: |
|
f364978e6e3f
Do not create bogus non-anonymous objects.
Stefan Seefeld <stefan@seefeld.name>
parents:
4268
diff
changeset
|
1485 self._formname = '%s%s@%s'%(classname, nodeid, name) |
|
f364978e6e3f
Do not create bogus non-anonymous objects.
Stefan Seefeld <stefan@seefeld.name>
parents:
4268
diff
changeset
|
1486 else: |
|
f364978e6e3f
Do not create bogus non-anonymous objects.
Stefan Seefeld <stefan@seefeld.name>
parents:
4268
diff
changeset
|
1487 # This case occurs when creating a property for a |
|
f364978e6e3f
Do not create bogus non-anonymous objects.
Stefan Seefeld <stefan@seefeld.name>
parents:
4268
diff
changeset
|
1488 # non-anonymous class. |
|
f364978e6e3f
Do not create bogus non-anonymous objects.
Stefan Seefeld <stefan@seefeld.name>
parents:
4268
diff
changeset
|
1489 self._formname = '%s@%s'%(classname, name) |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
1490 else: |
|
1468
f57759a5ee1a
Better form name mangling, doesn't confuse other things like generic editing.
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1491 self._formname = name |
|
1952
c40ed9113285
Applied Stefan Seefeld's html4/xhtml patch with some changes.
Richard Jones <richard@users.sourceforge.net>
parents:
1932
diff
changeset
|
1492 |
| 4056 | 1493 # If no value is already present for this property, see if one |
| 1494 # is specified in the current form. | |
| 1495 form = self._client.form | |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
1496 try: |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
1497 is_in = self._formname in form |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
1498 except TypeError: |
|
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
1499 is_in = False |
|
5166
232c74973a56
issue1408570: fix that form values are lost
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5156
diff
changeset
|
1500 if is_in and (not self._value or self._client.form_wins): |
| 4056 | 1501 if isinstance(prop, hyperdb.Multilink): |
| 1502 value = lookupIds(self._db, prop, | |
| 1503 handleListCGIValue(form[self._formname]), | |
| 1504 fail_ok=1) | |
| 1505 elif isinstance(prop, hyperdb.Link): | |
| 1506 value = form.getfirst(self._formname).strip() | |
| 1507 if value: | |
| 1508 value = lookupIds(self._db, prop, [value], | |
| 1509 fail_ok=1)[0] | |
| 1510 else: | |
| 1511 value = None | |
| 1512 else: | |
| 1513 value = form.getfirst(self._formname).strip() or None | |
| 1514 self._value = value | |
| 1515 | |
|
6404
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
1516 # if self._value is None see if we have a default value |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
1517 if self._value is None: |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
1518 self._value = prop.get_default_value() |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
1519 |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
1520 HTMLInputMixin.__init__(self) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1521 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1522 def __repr__(self): |
|
4463
1bd86e82422b
Make HTMLProperty report actual classname in repr().
Stefan Seefeld <stefan@seefeld.name>
parents:
4437
diff
changeset
|
1523 classname = self.__class__.__name__ |
|
1bd86e82422b
Make HTMLProperty report actual classname in repr().
Stefan Seefeld <stefan@seefeld.name>
parents:
4437
diff
changeset
|
1524 return '<%s(0x%x) %s %r %r>'%(classname, id(self), self._formname, |
|
1bd86e82422b
Make HTMLProperty report actual classname in repr().
Stefan Seefeld <stefan@seefeld.name>
parents:
4437
diff
changeset
|
1525 self._prop, self._value) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1526 def __str__(self): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1527 return self.plain() |
|
5414
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1528 def __lt__(self, other): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1529 if isinstance(other, HTMLProperty): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1530 return self._value < other._value |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1531 return self._value < other |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1532 def __le__(self, other): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1533 if isinstance(other, HTMLProperty): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1534 return self._value <= other._value |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1535 return self._value <= other |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1536 def __eq__(self, other): |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1537 if isinstance(other, HTMLProperty): |
|
5414
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1538 return self._value == other._value |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1539 return self._value == other |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1540 def __ne__(self, other): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1541 if isinstance(other, HTMLProperty): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1542 return self._value != other._value |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1543 return self._value != other |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1544 def __gt__(self, other): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1545 if isinstance(other, HTMLProperty): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1546 return self._value > other._value |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1547 return self._value > other |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1548 def __ge__(self, other): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1549 if isinstance(other, HTMLProperty): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1550 return self._value >= other._value |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
1551 return self._value >= other |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1552 |
|
5404
3757449e00c4
Python 3 preparation: use __bool__ instead of __nonzero__.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5402
diff
changeset
|
1553 def __bool__(self): |
|
2347
fbbda3b1816d
implement __nonzero__ for HTMLProperty
Richard Jones <richard@users.sourceforge.net>
parents:
2327
diff
changeset
|
1554 return not not self._value |
|
5404
3757449e00c4
Python 3 preparation: use __bool__ instead of __nonzero__.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5402
diff
changeset
|
1555 # Python 2 compatibility: |
|
3757449e00c4
Python 3 preparation: use __bool__ instead of __nonzero__.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5402
diff
changeset
|
1556 __nonzero__ = __bool__ |
|
2347
fbbda3b1816d
implement __nonzero__ for HTMLProperty
Richard Jones <richard@users.sourceforge.net>
parents:
2327
diff
changeset
|
1557 |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
1558 def isset(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1559 """Is my _value not None?""" |
|
2289
6d16b967f89d
HTML templating isset() inverted [SF#951779]
Richard Jones <richard@users.sourceforge.net>
parents:
2262
diff
changeset
|
1560 return self._value is not None |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
1561 |
|
2002
b046b65e51db
if you're going to enforce class-level permissions...
Richard Jones <richard@users.sourceforge.net>
parents:
1983
diff
changeset
|
1562 def is_edit_ok(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1563 """Should the user be allowed to use an edit form field for this |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1564 property. Check "Create" for new items, or "Edit" for existing |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1565 ones. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1566 """ |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1567 perm = self._db.security.hasPermission |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1568 userid = self._client.userid |
|
2002
b046b65e51db
if you're going to enforce class-level permissions...
Richard Jones <richard@users.sourceforge.net>
parents:
1983
diff
changeset
|
1569 if self._nodeid: |
|
4329
58b7ba47af87
fixes to make registration work again
Richard Jones <richard@users.sourceforge.net>
parents:
4328
diff
changeset
|
1570 if not perm('Web Access', userid): |
|
58b7ba47af87
fixes to make registration work again
Richard Jones <richard@users.sourceforge.net>
parents:
4328
diff
changeset
|
1571 return False |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1572 return perm('Edit', userid, self._classname, self._name, |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1573 self._nodeid) |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1574 return perm('Create', userid, self._classname, self._name) or \ |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1575 perm('Register', userid, self._classname, self._name) |
|
2002
b046b65e51db
if you're going to enforce class-level permissions...
Richard Jones <richard@users.sourceforge.net>
parents:
1983
diff
changeset
|
1576 |
|
b046b65e51db
if you're going to enforce class-level permissions...
Richard Jones <richard@users.sourceforge.net>
parents:
1983
diff
changeset
|
1577 def is_view_ok(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1578 """ Is the user allowed to View the current class? |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1579 """ |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1580 perm = self._db.security.hasPermission |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1581 if perm('Web Access', self._client.userid) and perm('View', |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
1582 self._client.userid, self._classname, self._name, self._nodeid): |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1583 return 1 |
|
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
1584 return self.is_edit_ok() |
|
2002
b046b65e51db
if you're going to enforce class-level permissions...
Richard Jones <richard@users.sourceforge.net>
parents:
1983
diff
changeset
|
1585 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1586 class StringHTMLProperty(HTMLProperty): |
|
3991
13161539e5bd
improved URL matching
Richard Jones <richard@users.sourceforge.net>
parents:
3972
diff
changeset
|
1587 hyper_re = re.compile(r'''( |
|
13161539e5bd
improved URL matching
Richard Jones <richard@users.sourceforge.net>
parents:
3972
diff
changeset
|
1588 (?P<url> |
|
4009
e335ce40d6c8
Make URL matching code less matchy
Richard Jones <richard@users.sourceforge.net>
parents:
3991
diff
changeset
|
1589 ( |
|
e335ce40d6c8
Make URL matching code less matchy
Richard Jones <richard@users.sourceforge.net>
parents:
3991
diff
changeset
|
1590 (ht|f)tp(s?):// # protocol |
|
4010
797eacd945af
add tests for and fix alex's examples
Richard Jones <richard@users.sourceforge.net>
parents:
4009
diff
changeset
|
1591 ([\w]+(:\w+)?@)? # username/password |
|
797eacd945af
add tests for and fix alex's examples
Richard Jones <richard@users.sourceforge.net>
parents:
4009
diff
changeset
|
1592 ([\w\-]+) # hostname |
|
797eacd945af
add tests for and fix alex's examples
Richard Jones <richard@users.sourceforge.net>
parents:
4009
diff
changeset
|
1593 ((\.[\w-]+)+)? # .domain.etc |
|
4009
e335ce40d6c8
Make URL matching code less matchy
Richard Jones <richard@users.sourceforge.net>
parents:
3991
diff
changeset
|
1594 | # ... or ... |
|
4010
797eacd945af
add tests for and fix alex's examples
Richard Jones <richard@users.sourceforge.net>
parents:
4009
diff
changeset
|
1595 ([\w]+(:\w+)?@)? # username/password |
|
4009
e335ce40d6c8
Make URL matching code less matchy
Richard Jones <richard@users.sourceforge.net>
parents:
3991
diff
changeset
|
1596 www\. # "www." |
|
e335ce40d6c8
Make URL matching code less matchy
Richard Jones <richard@users.sourceforge.net>
parents:
3991
diff
changeset
|
1597 ([\w\-]+\.)+ # hostname |
|
e335ce40d6c8
Make URL matching code less matchy
Richard Jones <richard@users.sourceforge.net>
parents:
3991
diff
changeset
|
1598 [\w]{2,5} # TLD |
|
e335ce40d6c8
Make URL matching code less matchy
Richard Jones <richard@users.sourceforge.net>
parents:
3991
diff
changeset
|
1599 ) |
|
e335ce40d6c8
Make URL matching code less matchy
Richard Jones <richard@users.sourceforge.net>
parents:
3991
diff
changeset
|
1600 (:[\d]{1,5})? # port |
|
e335ce40d6c8
Make URL matching code less matchy
Richard Jones <richard@users.sourceforge.net>
parents:
3991
diff
changeset
|
1601 (/[\w\-$.+!*(),;:@&=?/~\\#%]*)? # path etc. |
|
3991
13161539e5bd
improved URL matching
Richard Jones <richard@users.sourceforge.net>
parents:
3972
diff
changeset
|
1602 )| |
|
13161539e5bd
improved URL matching
Richard Jones <richard@users.sourceforge.net>
parents:
3972
diff
changeset
|
1603 (?P<email>[-+=%/\w\.]+@[\w\.\-]+)| |
|
6564
21c7c2041a4b
issue2551181 - allow issueXXX#fragment to generate a link with fragment
John Rouillard <rouilj@ieee.org>
parents:
6542
diff
changeset
|
1604 (?P<item>(?P<class>[A-Za-z_]+)(\s*)(?P<id>\d+)(?P<fragment>\#[^][\#%^{}"<>\s]+)?) |
|
3991
13161539e5bd
improved URL matching
Richard Jones <richard@users.sourceforge.net>
parents:
3972
diff
changeset
|
1605 )''', re.X | re.I) |
|
13161539e5bd
improved URL matching
Richard Jones <richard@users.sourceforge.net>
parents:
3972
diff
changeset
|
1606 protocol_re = re.compile('^(ht|f)tp(s?)://', re.I) |
|
13161539e5bd
improved URL matching
Richard Jones <richard@users.sourceforge.net>
parents:
3972
diff
changeset
|
1607 |
|
6098
72a281a55a17
Disable rst raw and include directives.
John Rouillard <rouilj@ieee.org>
parents:
6097
diff
changeset
|
1608 # disable rst directives that have security implications |
|
72a281a55a17
Disable rst raw and include directives.
John Rouillard <rouilj@ieee.org>
parents:
6097
diff
changeset
|
1609 rst_defaults = {'file_insertion_enabled': 0, |
|
72a281a55a17
Disable rst raw and include directives.
John Rouillard <rouilj@ieee.org>
parents:
6097
diff
changeset
|
1610 'raw_enabled': 0, |
|
72a281a55a17
Disable rst raw and include directives.
John Rouillard <rouilj@ieee.org>
parents:
6097
diff
changeset
|
1611 '_disable_config': 1} |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1612 |
|
6103
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1613 valid_schemes = { } |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1614 |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1615 def _hyper_repl(self, match): |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1616 if match.group('url'): |
|
5684
97e2125e064c
When we generate links from URL's in messages, we add rel="nofollow"
John Rouillard <rouilj@ieee.org>
parents:
5548
diff
changeset
|
1617 return self._hyper_repl_url(match, '<a href="%s" rel="nofollow noopener">%s</a>%s') |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1618 elif match.group('email'): |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1619 return self._hyper_repl_email(match, '<a href="mailto:%s">%s</a>') |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1620 elif len(match.group('id')) < 10: |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1621 return self._hyper_repl_item(match, |
|
6564
21c7c2041a4b
issue2551181 - allow issueXXX#fragment to generate a link with fragment
John Rouillard <rouilj@ieee.org>
parents:
6542
diff
changeset
|
1622 '<a href="%(cls)s%(id)s%(fragment)s">%(item)s</a>') |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1623 else: |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1624 # just return the matched text |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1625 return match.group(0) |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1626 |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1627 def _hyper_repl_url(self, match, replacement): |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1628 u = s = match.group('url') |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1629 if not self.protocol_re.search(s): |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1630 u = 'http://' + s |
|
4413
66603a9051f9
improve handling of '>' when URLs are converted to links
Richard Jones <richard@users.sourceforge.net>
parents:
4396
diff
changeset
|
1631 end = '' |
|
66603a9051f9
improve handling of '>' when URLs are converted to links
Richard Jones <richard@users.sourceforge.net>
parents:
4396
diff
changeset
|
1632 if '>' in s: |
|
66603a9051f9
improve handling of '>' when URLs are converted to links
Richard Jones <richard@users.sourceforge.net>
parents:
4396
diff
changeset
|
1633 # catch an escaped ">" in the URL |
|
66603a9051f9
improve handling of '>' when URLs are converted to links
Richard Jones <richard@users.sourceforge.net>
parents:
4396
diff
changeset
|
1634 pos = s.find('>') |
|
66603a9051f9
improve handling of '>' when URLs are converted to links
Richard Jones <richard@users.sourceforge.net>
parents:
4396
diff
changeset
|
1635 end = s[pos:] |
|
66603a9051f9
improve handling of '>' when URLs are converted to links
Richard Jones <richard@users.sourceforge.net>
parents:
4396
diff
changeset
|
1636 u = s = s[:pos] |
|
4647
11b6601629d7
#2550759: Trailing punctuation is no longer included when URLs are converted to links.
Ezio Melotti <ezio.melotti@gmail.com>
parents:
4587
diff
changeset
|
1637 if s.endswith(tuple('.,;:!')): |
|
11b6601629d7
#2550759: Trailing punctuation is no longer included when URLs are converted to links.
Ezio Melotti <ezio.melotti@gmail.com>
parents:
4587
diff
changeset
|
1638 # don't include trailing punctuation |
|
11b6601629d7
#2550759: Trailing punctuation is no longer included when URLs are converted to links.
Ezio Melotti <ezio.melotti@gmail.com>
parents:
4587
diff
changeset
|
1639 end = s[-1:] + end |
|
11b6601629d7
#2550759: Trailing punctuation is no longer included when URLs are converted to links.
Ezio Melotti <ezio.melotti@gmail.com>
parents:
4587
diff
changeset
|
1640 u = s = s[:-1] |
|
4413
66603a9051f9
improve handling of '>' when URLs are converted to links
Richard Jones <richard@users.sourceforge.net>
parents:
4396
diff
changeset
|
1641 if ')' in s and s.count('(') != s.count(')'): |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1642 # don't include extraneous ')' in the link |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1643 pos = s.rfind(')') |
|
4413
66603a9051f9
improve handling of '>' when URLs are converted to links
Richard Jones <richard@users.sourceforge.net>
parents:
4396
diff
changeset
|
1644 end = s[pos:] + end |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1645 u = s = s[:pos] |
|
4413
66603a9051f9
improve handling of '>' when URLs are converted to links
Richard Jones <richard@users.sourceforge.net>
parents:
4396
diff
changeset
|
1646 return replacement % (u, s, end) |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1647 |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1648 def _hyper_repl_email(self, match, replacement): |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1649 s = match.group('email') |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1650 return replacement % (s, s) |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1651 |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
1652 def _hyper_repl_item(self, match, replacement): |
|
3862
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1653 item = match.group('item') |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1654 cls = match.group('class').lower() |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1655 id = match.group('id') |
|
6564
21c7c2041a4b
issue2551181 - allow issueXXX#fragment to generate a link with fragment
John Rouillard <rouilj@ieee.org>
parents:
6542
diff
changeset
|
1656 fragment = match.group('fragment') |
|
21c7c2041a4b
issue2551181 - allow issueXXX#fragment to generate a link with fragment
John Rouillard <rouilj@ieee.org>
parents:
6542
diff
changeset
|
1657 if fragment is None: |
|
21c7c2041a4b
issue2551181 - allow issueXXX#fragment to generate a link with fragment
John Rouillard <rouilj@ieee.org>
parents:
6542
diff
changeset
|
1658 fragment="" |
|
3862
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1659 try: |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1660 # make sure cls is a valid tracker classname |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1661 cl = self._db.getclass(cls) |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1662 if not cl.hasnode(id): |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1663 return item |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1664 return replacement % locals() |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1665 except KeyError: |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1666 return item |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1667 |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1668 |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1669 def _hyper_repl_rst(self, match): |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1670 if match.group('url'): |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1671 s = match.group('url') |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1672 return '`%s <%s>`_'%(s, s) |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1673 elif match.group('email'): |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1674 s = match.group('email') |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1675 return '`%s <mailto:%s>`_'%(s, s) |
|
4288
ce684080e968
issue2550549: Some bugs issue classifiers were causing database lookup errors
Richard Jones <richard@users.sourceforge.net>
parents:
4286
diff
changeset
|
1676 elif len(match.group('id')) < 10: |
|
ce684080e968
issue2550549: Some bugs issue classifiers were causing database lookup errors
Richard Jones <richard@users.sourceforge.net>
parents:
4286
diff
changeset
|
1677 return self._hyper_repl_item(match,'`%(item)s <%(cls)s%(id)s>`_') |
|
3862
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1678 else: |
|
4288
ce684080e968
issue2550549: Some bugs issue classifiers were causing database lookup errors
Richard Jones <richard@users.sourceforge.net>
parents:
4286
diff
changeset
|
1679 # just return the matched text |
|
ce684080e968
issue2550549: Some bugs issue classifiers were causing database lookup errors
Richard Jones <richard@users.sourceforge.net>
parents:
4286
diff
changeset
|
1680 return match.group(0) |
|
1336
6a54b51b1784
hyperlinking of special message text
Richard Jones <richard@users.sourceforge.net>
parents:
1332
diff
changeset
|
1681 |
|
6097
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1682 def _hyper_repl_markdown(self, match): |
|
6280
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1683 for group in ['url', 'email']: |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1684 if match.group(group): |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1685 start = match.start(group) - 1 |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1686 end = match.end(group) |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1687 if start >= 0: |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1688 prefix = match.string[start] |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1689 if end < len(match.string): |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1690 suffix = match.string[end] |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1691 if (prefix, suffix) in { |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1692 ('<', '>'), |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1693 ('(', ')'), |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1694 }: |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1695 continue |
|
6299
fd0bdcbc68e4
issue2551104 - fix issue with markdown autolink next to punctuation
John Rouillard <rouilj@ieee.org>
parents:
6284
diff
changeset
|
1696 if prefix == '(' and ')' in match.group(group): |
|
6280
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1697 continue |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1698 s = match.group(group) |
|
6ed5152a92d0
issue2551096 - enable markdown autolink for email and bare url's.
John Rouillard <rouilj@ieee.org>
parents:
6279
diff
changeset
|
1699 return '<%s>' % s |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
1700 if match.group('id') and len(match.group('id')) < 10: |
|
6336
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1701 # Pass through markdown style links: |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1702 # [issue1](https://....) |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1703 # [issue1](issue1) |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1704 # as 'issue1'. Don't convert issue1 into a link. |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1705 # https://issues.roundup-tracker.org/issue2551108 |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1706 start = match.start('item') - 1 |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1707 end = match.end('item') |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1708 if start >= 0: |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1709 prefix = match.string[start] |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1710 if end < len(match.string): |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1711 suffix = match.string[end] |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1712 if (prefix, suffix) in {('[', ']')}: |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1713 if match.string[end+1] == '(': # find following ( |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1714 return match.group(0) |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1715 if (prefix, suffix) in {('(',')')}: |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1716 if match.string[start-1] == ']': |
|
6f89cdc7c938
issue2551108 - fix markdown formatted designator links
John Rouillard <rouilj@ieee.org>
parents:
6299
diff
changeset
|
1717 return match.group(0) |
|
6097
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1718 return self._hyper_repl_item(match,'[%(item)s](%(cls)s%(id)s)') |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1719 else: |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1720 # just return the matched text |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1721 return match.group(0) |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1722 |
|
5156
882fa4d9bead
issue2550795: @dispname query args in page.html search links
John Rouillard <rouilj@ieee.org>
parents:
5146
diff
changeset
|
1723 def url_quote(self): |
|
882fa4d9bead
issue2550795: @dispname query args in page.html search links
John Rouillard <rouilj@ieee.org>
parents:
5146
diff
changeset
|
1724 """ Return the string in plain format but escaped for use in a url """ |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5399
diff
changeset
|
1725 return urllib_.quote(self.plain()) |
|
5156
882fa4d9bead
issue2550795: @dispname query args in page.html search links
John Rouillard <rouilj@ieee.org>
parents:
5146
diff
changeset
|
1726 |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1727 def hyperlinked(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1728 """ Render a "hyperlinked" version of the text """ |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1729 return self.plain(hyperlink=1) |
|
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1730 |
|
1374
8e4c3e8de96f
fix StringHTMLProperty hyperlinking
Richard Jones <richard@users.sourceforge.net>
parents:
1370
diff
changeset
|
1731 def plain(self, escape=0, hyperlink=0): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1732 """Render a "plain" representation of the property |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
1733 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
1734 - "escape" turns on/off HTML quoting |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
1735 - "hyperlink" turns on/off in-text hyperlinking of URLs, email |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
1736 addresses and designators |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1737 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
1738 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
1739 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1740 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1741 if self._value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1742 return '' |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1743 if escape: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1744 s = html_escape(str(self._value)) |
|
1336
6a54b51b1784
hyperlinking of special message text
Richard Jones <richard@users.sourceforge.net>
parents:
1332
diff
changeset
|
1745 else: |
|
1374
8e4c3e8de96f
fix StringHTMLProperty hyperlinking
Richard Jones <richard@users.sourceforge.net>
parents:
1370
diff
changeset
|
1746 s = str(self._value) |
|
1336
6a54b51b1784
hyperlinking of special message text
Richard Jones <richard@users.sourceforge.net>
parents:
1332
diff
changeset
|
1747 if hyperlink: |
|
1773
5f15fb95180c
various cosmetic fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1771
diff
changeset
|
1748 # no, we *must* escape this text |
|
1374
8e4c3e8de96f
fix StringHTMLProperty hyperlinking
Richard Jones <richard@users.sourceforge.net>
parents:
1370
diff
changeset
|
1749 if not escape: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1750 s = html_escape(s) |
|
1394
d5314bfab0c0
fix incorrect hyperlinking markup
Richard Jones <richard@users.sourceforge.net>
parents:
1374
diff
changeset
|
1751 s = self.hyper_re.sub(self._hyper_repl, s) |
|
1336
6a54b51b1784
hyperlinking of special message text
Richard Jones <richard@users.sourceforge.net>
parents:
1332
diff
changeset
|
1752 return s |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1753 |
|
3644
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1754 def wrapped(self, escape=1, hyperlink=1): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1755 """Render a "wrapped" representation of the property. |
|
3644
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1756 |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1757 We wrap long lines at 80 columns on the nearest whitespace. Lines |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1758 with no whitespace are not broken to force wrapping. |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1759 |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1760 Note that unlike plain() we default wrapped() to have the escaping |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1761 and hyperlinking turned on since that's the most common usage. |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1762 |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1763 - "escape" turns on/off HTML quoting |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1764 - "hyperlink" turns on/off in-text hyperlinking of URLs, email |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1765 addresses and designators |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1766 """ |
|
3644
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1767 if not self.is_view_ok(): |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1768 return self._('[hidden]') |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1769 |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1770 if self._value is None: |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1771 return '' |
|
5043
ac0c117cd24c
Remove wrap and associated functions from roundup.support
John Kristensen <john@jerrykan.com>
parents:
5006
diff
changeset
|
1772 s = '\n'.join(textwrap.wrap(str(self._value), 80)) |
|
3644
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1773 if escape: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1774 s = html_escape(s) |
|
3644
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1775 if hyperlink: |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1776 # no, we *must* escape this text |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1777 if not escape: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1778 s = html_escape(s) |
|
3644
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1779 s = self.hyper_re.sub(self._hyper_repl, s) |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1780 return s |
|
f35ece8f8ff7
added StringHTMLProperty wrapped() method to wrap long lines in issue display
Richard Jones <richard@users.sourceforge.net>
parents:
3635
diff
changeset
|
1781 |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1782 def stext(self, escape=0, hyperlink=1): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1783 """ Render the value of the property as StructuredText. |
|
1123
644d3075c2df
more documentation, fixed bug in request/description
Richard Jones <richard@users.sourceforge.net>
parents:
1122
diff
changeset
|
1784 |
|
644d3075c2df
more documentation, fixed bug in request/description
Richard Jones <richard@users.sourceforge.net>
parents:
1122
diff
changeset
|
1785 This requires the StructureText module to be installed separately. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1786 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
1787 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
1788 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1789 |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1790 s = self.plain(escape=escape, hyperlink=hyperlink) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1791 if not StructuredText: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1792 return s |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1793 return StructuredText(s,level=1,header=0) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1794 |
|
3862
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1795 def rst(self, hyperlink=1): |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1796 """ Render the value of the property as ReStructuredText. |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1797 |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1798 This requires docutils to be installed separately. |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1799 """ |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1800 if not self.is_view_ok(): |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1801 return self._('[hidden]') |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1802 |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1803 if not ReStructuredText: |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1804 return self.plain(escape=0, hyperlink=hyperlink) |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1805 s = self.plain(escape=0, hyperlink=0) |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1806 if hyperlink: |
|
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1807 s = self.hyper_re.sub(self._hyper_repl_rst, s) |
|
6103
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1808 |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1809 # disable javascript and possibly other url schemes from working |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1810 from docutils.utils.urischemes import schemes |
|
6104
a1fd9551d416
don't allow javascript URLs in markdown content
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6103
diff
changeset
|
1811 for sch in _disable_url_schemes: |
|
6103
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1812 # I catch KeyError but reraise if scheme didn't exist. |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1813 # Safer to fail if a disabled scheme isn't found. It may |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1814 # be a typo that keeps a bad scheme enabled. But this |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1815 # function can be called multiple times. On the first call |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1816 # the key will be deleted. On the second call the schemes |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1817 # variable isn't re-initialized so the key is missing |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1818 # causing a KeyError. So see if we removed it (and entered |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1819 # it into valid_schemes). If we didn't raise KeyError. |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1820 try: |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1821 del(schemes[sch]) |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1822 self.valid_schemes[sch] = True |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1823 except KeyError: |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1824 if sch in self.valid_schemes: |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1825 pass |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1826 else: |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1827 raise |
|
af16c135fb98
url's with javascript scheme should not be links in reST
John Rouillard <rouilj@ieee.org>
parents:
6102
diff
changeset
|
1828 |
|
6098
72a281a55a17
Disable rst raw and include directives.
John Rouillard <rouilj@ieee.org>
parents:
6097
diff
changeset
|
1829 return u2s(ReStructuredText(s, writer_name="html", |
|
72a281a55a17
Disable rst raw and include directives.
John Rouillard <rouilj@ieee.org>
parents:
6097
diff
changeset
|
1830 settings_overrides=self.rst_defaults)["html_body"]) |
|
3862
b052820e86bf
Add a rst method to StringHTMLProperty...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3861
diff
changeset
|
1831 |
|
6097
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1832 def markdown(self, hyperlink=1): |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1833 """ Render the value of the property as markdown. |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1834 |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1835 This requires markdown2 or markdown to be installed separately. |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1836 """ |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1837 if not self.is_view_ok(): |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1838 return self._('[hidden]') |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1839 |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1840 if not markdown: |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1841 return self.plain(escape=0, hyperlink=hyperlink) |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1842 s = self.plain(escape=0, hyperlink=0) |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1843 if hyperlink: |
|
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1844 s = self.hyper_re.sub(self._hyper_repl_markdown, s) |
|
6275
bda491248fd8
Handle exception raised from markdown processing
John Rouillard <rouilj@ieee.org>
parents:
6215
diff
changeset
|
1845 try: |
|
6277
957a0fc20021
issue2551094 - markdown mismatch - new config for embedded newine
John Rouillard <rouilj@ieee.org>
parents:
6275
diff
changeset
|
1846 s = u2s(markdown(s2u(s), self._db.config)) |
|
6275
bda491248fd8
Handle exception raised from markdown processing
John Rouillard <rouilj@ieee.org>
parents:
6215
diff
changeset
|
1847 except Exception: # when markdown formatting fails return markup |
|
bda491248fd8
Handle exception raised from markdown processing
John Rouillard <rouilj@ieee.org>
parents:
6215
diff
changeset
|
1848 return self.plain(escape=0, hyperlink=hyperlink) |
|
bda491248fd8
Handle exception raised from markdown processing
John Rouillard <rouilj@ieee.org>
parents:
6215
diff
changeset
|
1849 return s |
|
6097
90a1470edbea
added markdown rendering support using either markdown2 or markdown
Christof Meerwald <cmeerw@cmeerw.org>
parents:
6095
diff
changeset
|
1850 |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1851 def field(self, **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1852 """ Render the property as a field in HTML. |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1853 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1854 If not editable, just display the value via plain(). |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1855 """ |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
1856 if not self.is_edit_ok(): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
1857 return self.plain(escape=1) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1858 |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
1859 value = self._value |
|
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
1860 if value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1861 value = '' |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1862 |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1863 kwargs.setdefault("size", 30) |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1864 kwargs.update({"name": self._formname, "value": value}) |
|
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
1865 return self.input(**kwargs) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1866 |
|
3905
6733a7cce7f4
multiline pass through extra keywords args
Justus Pendleton <jpend@users.sourceforge.net>
parents:
3903
diff
changeset
|
1867 def multiline(self, escape=0, rows=5, cols=40, **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1868 """ Render a multiline form edit field for the property. |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1869 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1870 If not editable, just display the plain() value in a <pre> tag. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1871 """ |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
1872 if not self.is_edit_ok(): |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
1873 return '<pre>%s</pre>'%self.plain() |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1874 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1875 if self._value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1876 value = '' |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1877 else: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1878 value = html_escape(str(self._value)) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1879 |
|
3710
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
1880 value = '"'.join(value.split('"')) |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
1881 name = self._formname |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
1882 passthrough_args = self.cgi_escape_attrs(**kwargs) |
|
3905
6733a7cce7f4
multiline pass through extra keywords args
Justus Pendleton <jpend@users.sourceforge.net>
parents:
3903
diff
changeset
|
1883 return ('<textarea %(passthrough_args)s name="%(name)s" id="%(name)s"' |
|
3710
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
1884 ' rows="%(rows)s" cols="%(cols)s">' |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
1885 '%(value)s</textarea>') % locals() |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1886 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1887 def email(self, escape=1): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1888 """ Render the value of the property as an obscured email address |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1889 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
1890 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
1891 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1892 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1893 if self._value is None: |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1894 value = '' |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1895 else: |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1896 value = str(self._value) |
|
3573
d7bab396c228
email obfuscation code in html templating is more robust
Richard Jones <richard@users.sourceforge.net>
parents:
3565
diff
changeset
|
1897 split = value.split('@') |
|
d7bab396c228
email obfuscation code in html templating is more robust
Richard Jones <richard@users.sourceforge.net>
parents:
3565
diff
changeset
|
1898 if len(split) == 2: |
|
d7bab396c228
email obfuscation code in html templating is more robust
Richard Jones <richard@users.sourceforge.net>
parents:
3565
diff
changeset
|
1899 name, domain = split |
|
1133
36ec30d286ea
Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents:
1124
diff
changeset
|
1900 domain = ' '.join(domain.split('.')[:-1]) |
|
36ec30d286ea
Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents:
1124
diff
changeset
|
1901 name = name.replace('.', ' ') |
|
36ec30d286ea
Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents:
1124
diff
changeset
|
1902 value = '%s at %s ...'%(name, domain) |
|
36ec30d286ea
Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents:
1124
diff
changeset
|
1903 else: |
|
36ec30d286ea
Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents:
1124
diff
changeset
|
1904 value = value.replace('.', ' ') |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1905 if escape: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1906 value = html_escape(value) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1907 return value |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1908 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1909 class PasswordHTMLProperty(HTMLProperty): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
1910 def plain(self, escape=0): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1911 """ Render a "plain" representation of the property |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1912 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
1913 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
1914 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1915 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1916 if self._value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1917 return '' |
|
5182
dc657fbbc790
- issue2550933 - Fix Traceback in cgi/templating.py when a string is
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
1918 try: |
|
dc657fbbc790
- issue2550933 - Fix Traceback in cgi/templating.py when a string is
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
1919 value = self._value.dummystr() |
|
dc657fbbc790
- issue2550933 - Fix Traceback in cgi/templating.py when a string is
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
1920 except AttributeError: |
|
dc657fbbc790
- issue2550933 - Fix Traceback in cgi/templating.py when a string is
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
1921 value = self._('[hidden]') |
|
4483
22bc0426e348
Second patch from issue2550688 -- with some changes:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4481
diff
changeset
|
1922 if escape: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
1923 value = html_escape(value) |
|
4483
22bc0426e348
Second patch from issue2550688 -- with some changes:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4481
diff
changeset
|
1924 return value |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1925 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
1926 def field(self, size=30, **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1927 """ Render a form edit field for the property. |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1928 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1929 If not editable, just display the value via plain(). |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1930 """ |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
1931 if not self.is_edit_ok(): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
1932 return self.plain(escape=1) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1933 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
1934 return self.input(type="password", name=self._formname, size=size, |
|
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
1935 **kwargs) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1936 |
|
3710
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
1937 def confirm(self, size=30): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1938 """ Render a second form edit field for the property, used for |
|
1144
db13f46cb5f9
password edit now has a confirmation field
Richard Jones <richard@users.sourceforge.net>
parents:
1136
diff
changeset
|
1939 confirmation that the user typed the password correctly. Generates |
|
1911
f5c804379c85
fixed ZRoundup - mostly changes to classic template
Richard Jones <richard@users.sourceforge.net>
parents:
1857
diff
changeset
|
1940 a field with name "@confirm@name". |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1941 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1942 If not editable, display nothing. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1943 """ |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
1944 if not self.is_edit_ok(): |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
1945 return '' |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1946 |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
1947 return self.input(type="password", |
|
3710
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
1948 name="@confirm@%s"%self._formname, |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
1949 id="%s-confirm"%self._formname, |
|
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
1950 size=size) |
|
1144
db13f46cb5f9
password edit now has a confirmation field
Richard Jones <richard@users.sourceforge.net>
parents:
1136
diff
changeset
|
1951 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1952 class NumberHTMLProperty(HTMLProperty): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
1953 def plain(self, escape=0): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1954 """ Render a "plain" representation of the property |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1955 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
1956 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
1957 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1958 |
|
2884
6d6fdd1daf92
NumberHTMLProperty should return "" not "None" if not set
Richard Jones <richard@users.sourceforge.net>
parents:
2883
diff
changeset
|
1959 if self._value is None: |
|
6d6fdd1daf92
NumberHTMLProperty should return "" not "None" if not set
Richard Jones <richard@users.sourceforge.net>
parents:
2883
diff
changeset
|
1960 return '' |
|
6d6fdd1daf92
NumberHTMLProperty should return "" not "None" if not set
Richard Jones <richard@users.sourceforge.net>
parents:
2883
diff
changeset
|
1961 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
1962 return str(self._value) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1963 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
1964 def field(self, size=30, **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1965 """ Render a form edit field for the property. |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1966 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1967 If not editable, just display the value via plain(). |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1968 """ |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
1969 if not self.is_edit_ok(): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
1970 return self.plain(escape=1) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
1971 |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
1972 value = self._value |
|
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
1973 if value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1974 value = '' |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
1975 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
1976 return self.input(name=self._formname, value=value, size=size, |
|
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
1977 **kwargs) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1978 |
|
1518
bb843662b708
basic numeric support for NumberHTMLProperty
Richard Jones <richard@users.sourceforge.net>
parents:
1513
diff
changeset
|
1979 def __int__(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1980 """ Return an int of me |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1981 """ |
|
1518
bb843662b708
basic numeric support for NumberHTMLProperty
Richard Jones <richard@users.sourceforge.net>
parents:
1513
diff
changeset
|
1982 return int(self._value) |
|
bb843662b708
basic numeric support for NumberHTMLProperty
Richard Jones <richard@users.sourceforge.net>
parents:
1513
diff
changeset
|
1983 |
|
bb843662b708
basic numeric support for NumberHTMLProperty
Richard Jones <richard@users.sourceforge.net>
parents:
1513
diff
changeset
|
1984 def __float__(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1985 """ Return a float of me |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
1986 """ |
|
1518
bb843662b708
basic numeric support for NumberHTMLProperty
Richard Jones <richard@users.sourceforge.net>
parents:
1513
diff
changeset
|
1987 return float(self._value) |
|
bb843662b708
basic numeric support for NumberHTMLProperty
Richard Jones <richard@users.sourceforge.net>
parents:
1513
diff
changeset
|
1988 |
|
5067
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1989 class IntegerHTMLProperty(HTMLProperty): |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1990 def plain(self, escape=0): |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1991 """ Render a "plain" representation of the property |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1992 """ |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1993 if not self.is_view_ok(): |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1994 return self._('[hidden]') |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1995 |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1996 if self._value is None: |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1997 return '' |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1998 |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
1999 return str(self._value) |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2000 |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2001 def field(self, size=30, **kwargs): |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2002 """ Render a form edit field for the property. |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2003 |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2004 If not editable, just display the value via plain(). |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2005 """ |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2006 if not self.is_edit_ok(): |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2007 return self.plain(escape=1) |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2008 |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2009 value = self._value |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2010 if value is None: |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2011 value = '' |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2012 |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2013 return self.input(name=self._formname, value=value, size=size, |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2014 **kwargs) |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2015 |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2016 def __int__(self): |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2017 """ Return an int of me |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2018 """ |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2019 return int(self._value) |
|
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2020 |
|
1518
bb843662b708
basic numeric support for NumberHTMLProperty
Richard Jones <richard@users.sourceforge.net>
parents:
1513
diff
changeset
|
2021 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2022 class BooleanHTMLProperty(HTMLProperty): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2023 def plain(self, escape=0): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2024 """ Render a "plain" representation of the property |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2025 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2026 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2027 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2028 |
|
1289
257f0ab00d50
bugfix in boolean templating
Richard Jones <richard@users.sourceforge.net>
parents:
1284
diff
changeset
|
2029 if self._value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2030 return '' |
|
3354
201dbcf63a30
use translation for boolean property rendering [SF#1225152]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3338
diff
changeset
|
2031 return self._value and self._("Yes") or self._("No") |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2032 |
|
4784
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2033 def field(self, labelfirst=False, y_label=None, n_label=None, |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2034 u_label=None, **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2035 """ Render a form edit field for the property |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2036 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2037 If not editable, just display the value via plain(). |
|
4784
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2038 |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2039 In addition to being able to set arbitrary html properties |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2040 using prop=val arguments, the thre arguments: |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2041 |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2042 y_label, n_label, u_label let you control the labels |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2043 associated with the yes, no (and optionally unknown/empty) |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2044 values. |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2045 |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2046 Also the labels can be placed before the radiobuttons by setting |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2047 labelfirst=True. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2048 """ |
|
2113
30aeb17e5b04
Boolean HTML templating was broken
Richard Jones <richard@users.sourceforge.net>
parents:
2106
diff
changeset
|
2049 if not self.is_edit_ok(): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2050 return self.plain(escape=1) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2051 |
|
3151
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2052 value = self._value |
|
5416
56c9bcdea47f
Python 3 preparation: unicode.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5414
diff
changeset
|
2053 if is_us(value): |
|
3151
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2054 value = value.strip().lower() in ('checked', 'yes', 'true', |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2055 'on', '1') |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2056 |
|
4784
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2057 if ( not y_label ): |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2058 y_label = '<label class="rblabel" for="%s_%s">'%(self._formname, 'yes') |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2059 y_label += self._('Yes') |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2060 y_label += '</label>' |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2061 |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2062 if ( not n_label ): |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2063 n_label = '<label class="rblabel" for="%s_%s">'%(self._formname, 'no') |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2064 n_label += self._('No') |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2065 n_label += '</label>' |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2066 |
|
3151
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2067 checked = value and "checked" or "" |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2068 if value: |
|
4784
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2069 y_rb = self.input(type="radio", name=self._formname, value="yes", |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2070 checked="checked", id="%s_%s"%(self._formname, 'yes'), **kwargs) |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2071 |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2072 n_rb =self.input(type="radio", name=self._formname, value="no", |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2073 id="%s_%s"%(self._formname, 'no'), **kwargs) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2074 else: |
|
4784
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2075 y_rb = self.input(type="radio", name=self._formname, value="yes", |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2076 id="%s_%s"%(self._formname, 'yes'), **kwargs) |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2077 |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2078 n_rb = self.input(type="radio", name=self._formname, value="no", |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2079 checked="checked", id="%s_%s"%(self._formname, 'no'), **kwargs) |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2080 |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2081 if ( u_label ): |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2082 if (u_label is True): # it was set via u_label=True |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2083 u_label = '' # make it empty but a string not boolean |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2084 u_rb = self.input(type="radio", name=self._formname, value="", |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2085 id="%s_%s"%(self._formname, 'unk'), **kwargs) |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2086 else: |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2087 # don't generate a trivalue radiobutton. |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2088 u_label = '' |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2089 u_rb='' |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2090 |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2091 if ( labelfirst ): |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2092 s = u_label + u_rb + y_label + y_rb + n_label + n_rb |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2093 else: |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2094 s = u_label + u_rb +y_rb + y_label + n_rb + n_label |
|
888676704342
issue2550808 BooleanHTMLProperty::field method html needs to be more
John Rouillard <rouilj@ieee.org>
parents:
4783
diff
changeset
|
2095 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2096 return s |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2097 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2098 class DateHTMLProperty(HTMLProperty): |
|
2956
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2099 |
|
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2100 _marker = [] |
|
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2101 |
|
2314
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2102 def __init__(self, client, classname, nodeid, prop, name, value, |
|
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2103 anonymous=0, offset=None): |
|
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2104 HTMLProperty.__init__(self, client, classname, nodeid, prop, name, |
|
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2105 value, anonymous=anonymous) |
|
5416
56c9bcdea47f
Python 3 preparation: unicode.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5414
diff
changeset
|
2106 if self._value and not is_us(self._value): |
|
2561
0dd3dca6bd01
always use translation service set in the tracker client instance;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2558
diff
changeset
|
2107 self._value.setTranslator(self._client.translator) |
|
2314
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2108 self._offset = offset |
|
3383
c1c67c62b699
applied patch [SF#236087]
Richard Jones <richard@users.sourceforge.net>
parents:
3369
diff
changeset
|
2109 if self._offset is None : |
|
c1c67c62b699
applied patch [SF#236087]
Richard Jones <richard@users.sourceforge.net>
parents:
3369
diff
changeset
|
2110 self._offset = self._prop.offset (self._db) |
|
2314
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2111 |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2112 def plain(self, escape=0): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2113 """ Render a "plain" representation of the property |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2114 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2115 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2116 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2117 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2118 if self._value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2119 return '' |
|
2314
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2120 if self._offset is None: |
|
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2121 offset = self._db.getUserTimezone() |
|
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2122 else: |
|
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2123 offset = self._offset |
|
4842
1e4c45a4254b
Allow using plain() on unsaved dates in HTML forms
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4839
diff
changeset
|
2124 try: |
|
1e4c45a4254b
Allow using plain() on unsaved dates in HTML forms
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4839
diff
changeset
|
2125 return str(self._value.local(offset)) |
|
1e4c45a4254b
Allow using plain() on unsaved dates in HTML forms
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4839
diff
changeset
|
2126 except AttributeError: |
|
1e4c45a4254b
Allow using plain() on unsaved dates in HTML forms
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4839
diff
changeset
|
2127 # not a date value, e.g. from unsaved form data |
|
1e4c45a4254b
Allow using plain() on unsaved dates in HTML forms
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4839
diff
changeset
|
2128 return str(self._value) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2129 |
|
2580
e90d63c7eceb
fixed DateHTMLProperty for invalid date entry [SF#986538]
Richard Jones <richard@users.sourceforge.net>
parents:
2574
diff
changeset
|
2130 def now(self, str_interval=None): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2131 """ Return the current time. |
|
1436
2f6647cf5345
bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents:
1421
diff
changeset
|
2132 |
|
2f6647cf5345
bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents:
1421
diff
changeset
|
2133 This is useful for defaulting a new value. Returns a |
|
2f6647cf5345
bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents:
1421
diff
changeset
|
2134 DateHTMLProperty. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2135 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2136 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2137 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2138 |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2139 ret = date.Date('.', translator=self._client) |
|
2471
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2140 |
|
5438
e2382945d302
Python 3 preparation: avoid basestring.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5423
diff
changeset
|
2141 if is_us(str_interval): |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2142 sign = 1 |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2143 if str_interval[0] == '-': |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2144 sign = -1 |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2145 str_interval = str_interval[1:] |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2146 interval = date.Interval(str_interval, translator=self._client) |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2147 if sign > 0: |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2148 ret = ret + interval |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2149 else: |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2150 ret = ret - interval |
|
2520
0914d72bb15b
fix single string split into three separate MsgIDs
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2471
diff
changeset
|
2151 |
| 2037 | 2152 return DateHTMLProperty(self._client, self._classname, self._nodeid, |
|
2471
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2153 self._prop, self._formname, ret) |
|
1436
2f6647cf5345
bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents:
1421
diff
changeset
|
2154 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2155 def field(self, size=30, default=None, format=_marker, popcal=True, |
|
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2156 **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2157 """Render a form edit field for the property |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2158 |
|
2956
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2159 If not editable, just display the value via plain(). |
|
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2160 |
|
3649
12633662ff63
include the popcal in Date field editing and search fields by default
Richard Jones <richard@users.sourceforge.net>
parents:
3644
diff
changeset
|
2161 If "popcal" then include the Javascript calendar editor. |
|
12633662ff63
include the popcal in Date field editing and search fields by default
Richard Jones <richard@users.sourceforge.net>
parents:
3644
diff
changeset
|
2162 Default=yes. |
|
12633662ff63
include the popcal in Date field editing and search fields by default
Richard Jones <richard@users.sourceforge.net>
parents:
3644
diff
changeset
|
2163 |
|
2956
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2164 The format string is a standard python strftime format string. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2165 """ |
|
2956
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2166 if not self.is_edit_ok(): |
|
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2167 if format is self._marker: |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2168 return self.plain(escape=1) |
|
2956
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2169 else: |
|
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2170 return self.pretty(format) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2171 |
|
3151
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2172 value = self._value |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2173 |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2174 if value is None: |
|
2471
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2175 if default is None: |
|
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2176 raw_value = None |
|
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2177 else: |
|
5438
e2382945d302
Python 3 preparation: avoid basestring.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5423
diff
changeset
|
2178 if is_us(default): |
|
3832
bbc977e1cd2c
Fix handling of defaults for date fields
Richard Jones <richard@users.sourceforge.net>
parents:
3785
diff
changeset
|
2179 raw_value = date.Date(default, translator=self._client) |
|
2471
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2180 elif isinstance(default, date.Date): |
|
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2181 raw_value = default |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2182 elif isinstance(default, DateHTMLProperty): |
|
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2183 raw_value = default._value |
|
2471
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2184 else: |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
2185 raise ValueError(self._('default value for ' |
|
2520
0914d72bb15b
fix single string split into three separate MsgIDs
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2471
diff
changeset
|
2186 'DateHTMLProperty must be either DateHTMLProperty ' |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
2187 'or string date representation.')) |
|
5416
56c9bcdea47f
Python 3 preparation: unicode.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5414
diff
changeset
|
2188 elif is_us(value): |
|
3151
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2189 # most likely erroneous input to be passed back to user |
|
5416
56c9bcdea47f
Python 3 preparation: unicode.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5414
diff
changeset
|
2190 value = us2s(value) |
|
4927
c120f747e0b4
In case of an error, date fields would lose the calendar help, fixed.
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4880
diff
changeset
|
2191 s = self.input(name=self._formname, value=value, size=size, |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2192 **kwargs) |
|
4927
c120f747e0b4
In case of an error, date fields would lose the calendar help, fixed.
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4880
diff
changeset
|
2193 if popcal: |
|
c120f747e0b4
In case of an error, date fields would lose the calendar help, fixed.
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4880
diff
changeset
|
2194 s += self.popcal() |
|
c120f747e0b4
In case of an error, date fields would lose the calendar help, fixed.
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4880
diff
changeset
|
2195 return s |
|
2471
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2196 else: |
|
3151
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2197 raw_value = value |
|
2471
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2198 |
|
31cd032291c5
new templating features
Richard Jones <richard@users.sourceforge.net>
parents:
2466
diff
changeset
|
2199 if raw_value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2200 value = '' |
|
5416
56c9bcdea47f
Python 3 preparation: unicode.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5414
diff
changeset
|
2201 elif is_us(raw_value): |
|
2956
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2202 if format is self._marker: |
|
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2203 value = raw_value |
|
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2204 else: |
|
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2205 value = date.Date(raw_value).pretty(format) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2206 else: |
|
3383
c1c67c62b699
applied patch [SF#236087]
Richard Jones <richard@users.sourceforge.net>
parents:
3369
diff
changeset
|
2207 if self._offset is None : |
|
c1c67c62b699
applied patch [SF#236087]
Richard Jones <richard@users.sourceforge.net>
parents:
3369
diff
changeset
|
2208 offset = self._db.getUserTimezone() |
|
c1c67c62b699
applied patch [SF#236087]
Richard Jones <richard@users.sourceforge.net>
parents:
3369
diff
changeset
|
2209 else : |
|
c1c67c62b699
applied patch [SF#236087]
Richard Jones <richard@users.sourceforge.net>
parents:
3369
diff
changeset
|
2210 offset = self._offset |
|
c1c67c62b699
applied patch [SF#236087]
Richard Jones <richard@users.sourceforge.net>
parents:
3369
diff
changeset
|
2211 value = raw_value.local(offset) |
|
2956
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2212 if format is not self._marker: |
|
4511fd6c5dbf
format parameter for DateHTMLProperty.field() (based on patch [SF#1072834])
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2884
diff
changeset
|
2213 value = value.pretty(format) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2214 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2215 s = self.input(name=self._formname, value=value, size=size, |
|
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2216 **kwargs) |
|
3649
12633662ff63
include the popcal in Date field editing and search fields by default
Richard Jones <richard@users.sourceforge.net>
parents:
3644
diff
changeset
|
2217 if popcal: |
|
12633662ff63
include the popcal in Date field editing and search fields by default
Richard Jones <richard@users.sourceforge.net>
parents:
3644
diff
changeset
|
2218 s += self.popcal() |
|
12633662ff63
include the popcal in Date field editing and search fields by default
Richard Jones <richard@users.sourceforge.net>
parents:
3644
diff
changeset
|
2219 return s |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2220 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2221 def reldate(self, pretty=1): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2222 """ Render the interval between the date and now. |
|
1124
1fc1f92c5f31
more doc, bugfix in Batch
Richard Jones <richard@users.sourceforge.net>
parents:
1123
diff
changeset
|
2223 |
|
1fc1f92c5f31
more doc, bugfix in Batch
Richard Jones <richard@users.sourceforge.net>
parents:
1123
diff
changeset
|
2224 If the "pretty" flag is true, then make the display pretty. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2225 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2226 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2227 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2228 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2229 if not self._value: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2230 return '' |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2231 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2232 # figure the interval |
|
2524
736115d374f2
use client instance to translate Date and Interval objects
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2520
diff
changeset
|
2233 interval = self._value - date.Date('.', translator=self._client) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2234 if pretty: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2235 return interval.pretty() |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2236 return str(interval) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2237 |
|
1453
b72f422d1e5e
better handling of format param
Richard Jones <richard@users.sourceforge.net>
parents:
1451
diff
changeset
|
2238 def pretty(self, format=_marker): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2239 """ Render the date in a pretty format (eg. month names, spaces). |
|
1272
cae50587fb96
expose the Date.pretty method to templating
Richard Jones <richard@users.sourceforge.net>
parents:
1270
diff
changeset
|
2240 |
|
cae50587fb96
expose the Date.pretty method to templating
Richard Jones <richard@users.sourceforge.net>
parents:
1270
diff
changeset
|
2241 The format string is a standard python strftime format string. |
|
cae50587fb96
expose the Date.pretty method to templating
Richard Jones <richard@users.sourceforge.net>
parents:
1270
diff
changeset
|
2242 Note that if the day is zero, and appears at the start of the |
|
cae50587fb96
expose the Date.pretty method to templating
Richard Jones <richard@users.sourceforge.net>
parents:
1270
diff
changeset
|
2243 string, then it'll be stripped from the output. This is handy |
|
3479
86d6131847e8
timezone now applied to date for pretty-format [SF#1406861]
Richard Jones <richard@users.sourceforge.net>
parents:
3472
diff
changeset
|
2244 for the situation when a date only specifies a month and a year. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2245 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2246 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2247 return self._('[hidden]') |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
2248 |
|
3479
86d6131847e8
timezone now applied to date for pretty-format [SF#1406861]
Richard Jones <richard@users.sourceforge.net>
parents:
3472
diff
changeset
|
2249 if self._offset is None: |
|
86d6131847e8
timezone now applied to date for pretty-format [SF#1406861]
Richard Jones <richard@users.sourceforge.net>
parents:
3472
diff
changeset
|
2250 offset = self._db.getUserTimezone() |
|
86d6131847e8
timezone now applied to date for pretty-format [SF#1406861]
Richard Jones <richard@users.sourceforge.net>
parents:
3472
diff
changeset
|
2251 else: |
|
86d6131847e8
timezone now applied to date for pretty-format [SF#1406861]
Richard Jones <richard@users.sourceforge.net>
parents:
3472
diff
changeset
|
2252 offset = self._offset |
|
3509
dcaa366b2cc8
fix StructuredText import;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3505
diff
changeset
|
2253 |
|
6377
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2254 try: |
|
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2255 if not self._value: |
|
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2256 return '' |
|
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2257 elif format is not self._marker: |
|
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2258 return self._value.local(offset).pretty(format) |
|
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2259 else: |
|
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2260 return self._value.local(offset).pretty() |
|
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2261 except AttributeError: |
|
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2262 # not a date value, e.g. from unsaved form data |
|
a7e7314fb7d9
issue2551126 - AttributeError: 'str' object has no attribute 'local'.
John Rouillard <rouilj@ieee.org>
parents:
6336
diff
changeset
|
2263 return str(self._value) |
|
1272
cae50587fb96
expose the Date.pretty method to templating
Richard Jones <richard@users.sourceforge.net>
parents:
1270
diff
changeset
|
2264 |
|
1320
3758a5af985f
Lots of little fixes in this update:
Richard Jones <richard@users.sourceforge.net>
parents:
1289
diff
changeset
|
2265 def local(self, offset): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2266 """ Return the date/time as a local (timezone offset) date/time. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2267 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2268 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2269 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2270 |
|
2036
bc5ff0519b8b
fixed bug in args to new DateHTMLProperty in the local() method [SF#901444]
Richard Jones <richard@users.sourceforge.net>
parents:
2031
diff
changeset
|
2271 return DateHTMLProperty(self._client, self._classname, self._nodeid, |
|
2314
7c8d2e9a0566
fix DateHTMLProperty so local() can override user timezone [SF#953678]
Richard Jones <richard@users.sourceforge.net>
parents:
2289
diff
changeset
|
2272 self._prop, self._formname, self._value, offset=offset) |
|
1320
3758a5af985f
Lots of little fixes in this update:
Richard Jones <richard@users.sourceforge.net>
parents:
1289
diff
changeset
|
2273 |
|
3710
2862cb0d9be4
default attributes for input fields:
Tobias Herp <tobias-herp@users.sourceforge.net>
parents:
3702
diff
changeset
|
2274 def popcal(self, width=300, height=200, label="(cal)", |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2275 form="itemSynopsis"): |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2276 """Generate a link to a calendar pop-up window. |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2277 |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2278 item: HTMLProperty e.g.: context.deadline |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2279 """ |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2280 if self.isset(): |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2281 date = "&date=%s"%self._value |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2282 else : |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2283 date = "" |
|
6215
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
2284 |
|
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
2285 data_attr = { |
|
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
2286 "data-calurl": '%s?@template=calendar&property=%s&form=%s%s' % (self._classname, self._name, form, date), |
|
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
2287 "data-width": width, |
|
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
2288 "data-height": height |
|
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
2289 } |
|
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
2290 |
|
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
2291 return ('<a class="classhelp" %s href="javascript:help_window(' |
|
4052
f8ba421ee4b0
Quote ampersands in URLs.
Stefan Seefeld <stefan@seefeld.name>
parents:
4051
diff
changeset
|
2292 "'%s?@template=calendar&property=%s&form=%s%s', %d, %d)" |
|
6215
af372b9372f6
Add data attributes to classhelp to allow use with CSP.
John Rouillard <rouilj@ieee.org>
parents:
6150
diff
changeset
|
2293 '">%s</a>'%(self.cgi_escape_attrs(**data_attr),self._classname, self._name, form, date, width, |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2294 height, label)) |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
2295 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2296 class IntervalHTMLProperty(HTMLProperty): |
|
2389
2ff93cee9c63
StaticTranslationService got methods gettext() and ngettext()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2377
diff
changeset
|
2297 def __init__(self, client, classname, nodeid, prop, name, value, |
|
2ff93cee9c63
StaticTranslationService got methods gettext() and ngettext()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2377
diff
changeset
|
2298 anonymous=0): |
|
2ff93cee9c63
StaticTranslationService got methods gettext() and ngettext()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2377
diff
changeset
|
2299 HTMLProperty.__init__(self, client, classname, nodeid, prop, |
|
2ff93cee9c63
StaticTranslationService got methods gettext() and ngettext()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2377
diff
changeset
|
2300 name, value, anonymous) |
|
5416
56c9bcdea47f
Python 3 preparation: unicode.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5414
diff
changeset
|
2301 if self._value and not is_us(self._value): |
|
2561
0dd3dca6bd01
always use translation service set in the tracker client instance;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2558
diff
changeset
|
2302 self._value.setTranslator(self._client.translator) |
|
2389
2ff93cee9c63
StaticTranslationService got methods gettext() and ngettext()...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2377
diff
changeset
|
2303 |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2304 def plain(self, escape=0): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2305 """ Render a "plain" representation of the property |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2306 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2307 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2308 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2309 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2310 if self._value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2311 return '' |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2312 return str(self._value) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2313 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2314 def pretty(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2315 """ Render the interval in a pretty format (eg. "yesterday") |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2316 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2317 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2318 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2319 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2320 return self._value.pretty() |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2321 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2322 def field(self, size=30, **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2323 """ Render a form edit field for the property |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2324 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2325 If not editable, just display the value via plain(). |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2326 """ |
|
3040
14322134dcef
fix permissions checks in cgi templating [SF#1082755]
Richard Jones <richard@users.sourceforge.net>
parents:
3006
diff
changeset
|
2327 if not self.is_edit_ok(): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2328 return self.plain(escape=1) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2329 |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
2330 value = self._value |
|
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
2331 if value is None: |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2332 value = '' |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
2333 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2334 return self.input(name=self._formname, value=value, size=size, |
|
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2335 **kwargs) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2336 |
|
4878
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
2337 class LinkHTMLProperty(HTMLProperty): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2338 """ Link HTMLProperty |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2339 Include the above as well as being able to access the class |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2340 information. Stringifying the object itself results in the value |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2341 from the item being displayed. Accessing attributes of this object |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2342 result in the appropriate entry from the class being queried for the |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2343 property accessed (so item/assignedto/name would look up the user |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2344 entry identified by the assignedto property on item, and then the |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2345 name property of that user) |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2346 """ |
|
1447
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
2347 def __init__(self, *args, **kw): |
|
6118d4498db3
added "foo@" prefix to all but "context" form variable names
Richard Jones <richard@users.sourceforge.net>
parents:
1441
diff
changeset
|
2348 HTMLProperty.__init__(self, *args, **kw) |
|
1323
80eef084069a
Fix to handle bad form submissions, Links and the magic -1 form value.
Richard Jones <richard@users.sourceforge.net>
parents:
1322
diff
changeset
|
2349 # if we're representing a form value, then the -1 from the form really |
|
80eef084069a
Fix to handle bad form submissions, Links and the magic -1 form value.
Richard Jones <richard@users.sourceforge.net>
parents:
1322
diff
changeset
|
2350 # should be a None |
|
80eef084069a
Fix to handle bad form submissions, Links and the magic -1 form value.
Richard Jones <richard@users.sourceforge.net>
parents:
1322
diff
changeset
|
2351 if str(self._value) == '-1': |
|
80eef084069a
Fix to handle bad form submissions, Links and the magic -1 form value.
Richard Jones <richard@users.sourceforge.net>
parents:
1322
diff
changeset
|
2352 self._value = None |
|
80eef084069a
Fix to handle bad form submissions, Links and the magic -1 form value.
Richard Jones <richard@users.sourceforge.net>
parents:
1322
diff
changeset
|
2353 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2354 def __getattr__(self, attr): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2355 """ return a new HTMLItem """ |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2356 if not self._value: |
|
3394
5c7ff95fecad
work around pagetemplate oddity
Richard Jones <richard@users.sourceforge.net>
parents:
3383
diff
changeset
|
2357 # handle a special page templates lookup |
|
5c7ff95fecad
work around pagetemplate oddity
Richard Jones <richard@users.sourceforge.net>
parents:
3383
diff
changeset
|
2358 if attr == '__render_with_namespace__': |
|
5c7ff95fecad
work around pagetemplate oddity
Richard Jones <richard@users.sourceforge.net>
parents:
3383
diff
changeset
|
2359 def nothing(*args, **kw): |
|
5c7ff95fecad
work around pagetemplate oddity
Richard Jones <richard@users.sourceforge.net>
parents:
3383
diff
changeset
|
2360 return '' |
|
5c7ff95fecad
work around pagetemplate oddity
Richard Jones <richard@users.sourceforge.net>
parents:
3383
diff
changeset
|
2361 return nothing |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2362 msg = self._('Attempt to look up %(attr)s on a missing value') |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2363 return MissingValue(msg%locals()) |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
2364 i = HTMLItem(self._client, self._prop.classname, self._value) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2365 return getattr(i, attr) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2366 |
|
4878
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
2367 def __getitem__(self, item): |
|
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
2368 """Explicitly define __getitem__ -- this used to work earlier |
|
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
2369 due to __getattr__ returning the __getitem__ of HTMLItem -- this |
|
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
2370 lookup doesn't work for new-style classes. |
|
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
2371 """ |
|
4879
302c967d710c
HTML* classes for cgi: handle MissingValue case
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4878
diff
changeset
|
2372 if not self._value: |
|
302c967d710c
HTML* classes for cgi: handle MissingValue case
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4878
diff
changeset
|
2373 msg = self._('Attempt to look up %(item)s on a missing value') |
|
302c967d710c
HTML* classes for cgi: handle MissingValue case
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4878
diff
changeset
|
2374 return MissingValue(msg%locals()) |
|
4878
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
2375 i = HTMLItem(self._client, self._prop.classname, self._value) |
|
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
2376 return i[item] |
|
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
2377 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2378 def plain(self, escape=0): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2379 """ Render a "plain" representation of the property |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2380 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2381 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2382 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2383 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2384 if self._value is None: |
|
1099
7362dc1f0226
Made "creator" property a String like it should be (we can't lookup()
Richard Jones <richard@users.sourceforge.net>
parents:
1097
diff
changeset
|
2385 return '' |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2386 linkcl = self._db.classes[self._prop.classname] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2387 k = linkcl.labelprop(1) |
|
3936
63d58cc1394a
make LinkHTMLProperty handle non-existing keys (patch [SF#1815895])
Richard Jones <richard@users.sourceforge.net>
parents:
3909
diff
changeset
|
2388 if num_re.match(self._value): |
|
4058
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2389 try: |
|
6620
b7093aa16895
issue2551196 - Unset labelprop of a Multilink can lead to Python error when using context/history
John Rouillard <rouilj@ieee.org>
parents:
6593
diff
changeset
|
2390 value = str(linkcl.get(self._value, k, |
|
b7093aa16895
issue2551196 - Unset labelprop of a Multilink can lead to Python error when using context/history
John Rouillard <rouilj@ieee.org>
parents:
6593
diff
changeset
|
2391 default=self._("[label is missing]"))) |
|
4058
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2392 except IndexError: |
|
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2393 value = self._value |
|
3936
63d58cc1394a
make LinkHTMLProperty handle non-existing keys (patch [SF#1815895])
Richard Jones <richard@users.sourceforge.net>
parents:
3909
diff
changeset
|
2394 else : |
|
63d58cc1394a
make LinkHTMLProperty handle non-existing keys (patch [SF#1815895])
Richard Jones <richard@users.sourceforge.net>
parents:
3909
diff
changeset
|
2395 value = self._value |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2396 if escape: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
2397 value = html_escape(value) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2398 return value |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2399 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2400 def field(self, showid=0, size=None, **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2401 """ Render a form edit field for the property |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2402 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2403 If not editable, just display the value via plain(). |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2404 """ |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2405 if not self.is_edit_ok(): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2406 return self.plain(escape=1) |
|
1322
c0546b95aad1
finished off handling of retired flag in filter() [SF#635260]
Richard Jones <richard@users.sourceforge.net>
parents:
1320
diff
changeset
|
2407 |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2408 # edit field |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2409 linkcl = self._db.getclass(self._prop.classname) |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2410 if self._value is None: |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2411 value = '' |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2412 else: |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2413 k = linkcl.getkey() |
|
4958
9b1302f9fb11
Fix for 'try_id_parsing'
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4945
diff
changeset
|
2414 idparse = self._prop.try_id_parsing |
|
4959
177b77302262
Another fix for 'try_id_parsing'
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4958
diff
changeset
|
2415 if k and num_re.match(self._value): |
|
177b77302262
Another fix for 'try_id_parsing'
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4958
diff
changeset
|
2416 try : |
|
177b77302262
Another fix for 'try_id_parsing'
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4958
diff
changeset
|
2417 value = linkcl.get(self._value, k) |
|
177b77302262
Another fix for 'try_id_parsing'
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4958
diff
changeset
|
2418 except IndexError : |
|
177b77302262
Another fix for 'try_id_parsing'
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4958
diff
changeset
|
2419 if idparse : |
|
177b77302262
Another fix for 'try_id_parsing'
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4958
diff
changeset
|
2420 raise |
|
177b77302262
Another fix for 'try_id_parsing'
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4958
diff
changeset
|
2421 value = '' |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2422 else: |
|
2116
1ef1b050b785
fix Link HTML field()
Richard Jones <richard@users.sourceforge.net>
parents:
2113
diff
changeset
|
2423 value = self._value |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2424 return self.input(name=self._formname, value=value, size=size, |
|
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2425 **kwargs) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2426 |
|
3470
fd32170475f5
allow preselection of values in templating menu()s (patch [SF#1396085])
Richard Jones <richard@users.sourceforge.net>
parents:
3461
diff
changeset
|
2427 def menu(self, size=None, height=None, showid=0, additional=[], value=None, |
|
5181
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2428 sort_on=None, html_kwargs={}, translate=True, showdef=None, **conditions): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2429 """ Render a form select list for this property |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2430 |
|
3127
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2431 "size" is used to limit the length of the list labels |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2432 "height" is used to set the <select> tag's "size" attribute |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2433 "showid" includes the item ids in the list labels |
|
3470
fd32170475f5
allow preselection of values in templating menu()s (patch [SF#1396085])
Richard Jones <richard@users.sourceforge.net>
parents:
3461
diff
changeset
|
2434 "value" specifies which item is pre-selected |
|
3127
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2435 "additional" lists properties which should be included in the |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2436 label |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2437 "sort_on" indicates the property to sort the list on as |
|
3361
64cc03598c8a
fixed templating menu() sort_on handling [SF#1221936]
Richard Jones <richard@users.sourceforge.net>
parents:
3357
diff
changeset
|
2438 (direction, property) where direction is '+' or '-'. A |
|
64cc03598c8a
fixed templating menu() sort_on handling [SF#1221936]
Richard Jones <richard@users.sourceforge.net>
parents:
3357
diff
changeset
|
2439 single string with the direction prepended may be used. |
|
64cc03598c8a
fixed templating menu() sort_on handling [SF#1221936]
Richard Jones <richard@users.sourceforge.net>
parents:
3357
diff
changeset
|
2440 For example: ('-', 'order'), '+name'. |
|
4537
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2441 "html_kwargs" specified additional html args for the |
|
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2442 generated html <select> |
|
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2443 "translate" indicates if we should do translation of labels |
|
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2444 using gettext -- this is often desired (e.g. for status |
|
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2445 labels) but sometimes not. |
|
5181
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2446 "showdef" marks the default value with the string passed |
|
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2447 as the showdef argument. It is appended to the selected |
|
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2448 value so the user can reset the menu to the original value. |
|
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2449 Note that the marker may be removed if the length of |
|
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2450 the option label and the marker exceed the size. |
|
3270
e4607e12d030
ignore sorting errors in MultilinkHTMLProperty instantiation [SF#1177602]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3253
diff
changeset
|
2451 |
|
3127
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2452 The remaining keyword arguments are used as conditions for |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2453 filtering the items in the list - they're passed as the |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2454 "filterspec" argument to a Class.filter() call. |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2455 |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2456 If not editable, just display the value via plain(). |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2457 """ |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2458 if not self.is_edit_ok(): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2459 return self.plain(escape=1) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2460 |
|
4043
32965347a663
Allow 'no value' to be selected in LinkHTMLProperty.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4042
diff
changeset
|
2461 # Since None indicates the default, we need another way to |
|
32965347a663
Allow 'no value' to be selected in LinkHTMLProperty.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4042
diff
changeset
|
2462 # indicate "no selection". We use -1 for this purpose, as |
|
32965347a663
Allow 'no value' to be selected in LinkHTMLProperty.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4042
diff
changeset
|
2463 # that is the value we use when submitting a form without the |
|
32965347a663
Allow 'no value' to be selected in LinkHTMLProperty.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4042
diff
changeset
|
2464 # value set. |
|
3470
fd32170475f5
allow preselection of values in templating menu()s (patch [SF#1396085])
Richard Jones <richard@users.sourceforge.net>
parents:
3461
diff
changeset
|
2465 if value is None: |
|
fd32170475f5
allow preselection of values in templating menu()s (patch [SF#1396085])
Richard Jones <richard@users.sourceforge.net>
parents:
3461
diff
changeset
|
2466 value = self._value |
|
4043
32965347a663
Allow 'no value' to be selected in LinkHTMLProperty.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4042
diff
changeset
|
2467 elif value == '-1': |
|
32965347a663
Allow 'no value' to be selected in LinkHTMLProperty.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4042
diff
changeset
|
2468 value = None |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2469 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2470 linkcl = self._db.getclass(self._prop.classname) |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
2471 l = ['<select %s>'%self.cgi_escape_attrs(name = self._formname, |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2472 **html_kwargs)] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2473 k = linkcl.labelprop(1) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2474 s = '' |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2475 if value is None: |
|
1952
c40ed9113285
Applied Stefan Seefeld's html4/xhtml patch with some changes.
Richard Jones <richard@users.sourceforge.net>
parents:
1932
diff
changeset
|
2476 s = 'selected="selected" ' |
|
2396
39cdddd313ca
HTMLInputMixin provides translation interface for all its hiers...
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2390
diff
changeset
|
2477 l.append(self._('<option %svalue="-1">- no selection -</option>')%s) |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2478 |
|
3361
64cc03598c8a
fixed templating menu() sort_on handling [SF#1221936]
Richard Jones <richard@users.sourceforge.net>
parents:
3357
diff
changeset
|
2479 if sort_on is not None: |
|
64cc03598c8a
fixed templating menu() sort_on handling [SF#1221936]
Richard Jones <richard@users.sourceforge.net>
parents:
3357
diff
changeset
|
2480 if not isinstance(sort_on, tuple): |
|
64cc03598c8a
fixed templating menu() sort_on handling [SF#1221936]
Richard Jones <richard@users.sourceforge.net>
parents:
3357
diff
changeset
|
2481 if sort_on[0] in '+-': |
|
64cc03598c8a
fixed templating menu() sort_on handling [SF#1221936]
Richard Jones <richard@users.sourceforge.net>
parents:
3357
diff
changeset
|
2482 sort_on = (sort_on[0], sort_on[1:]) |
|
64cc03598c8a
fixed templating menu() sort_on handling [SF#1221936]
Richard Jones <richard@users.sourceforge.net>
parents:
3357
diff
changeset
|
2483 else: |
|
64cc03598c8a
fixed templating menu() sort_on handling [SF#1221936]
Richard Jones <richard@users.sourceforge.net>
parents:
3357
diff
changeset
|
2484 sort_on = ('+', sort_on) |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
2485 else: |
| 4032 | 2486 sort_on = ('+', linkcl.orderprop()) |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2487 |
|
3565
32343bfc3da0
add permission filter to menu() implementations [SF#1431188]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3562
diff
changeset
|
2488 options = [opt |
|
32343bfc3da0
add permission filter to menu() implementations [SF#1431188]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3562
diff
changeset
|
2489 for opt in linkcl.filter(None, conditions, sort_on, (None, None)) |
|
32343bfc3da0
add permission filter to menu() implementations [SF#1431188]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3562
diff
changeset
|
2490 if self._db.security.hasPermission("View", self._client.userid, |
|
3594
b5b6a6f7743a
fix bug in menu() permission filter [SF#1444440]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3584
diff
changeset
|
2491 linkcl.classname, itemid=opt)] |
|
1322
c0546b95aad1
finished off handling of retired flag in filter() [SF#635260]
Richard Jones <richard@users.sourceforge.net>
parents:
1320
diff
changeset
|
2492 |
|
c0546b95aad1
finished off handling of retired flag in filter() [SF#635260]
Richard Jones <richard@users.sourceforge.net>
parents:
1320
diff
changeset
|
2493 # make sure we list the current value if it's retired |
|
3151
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2494 if value and value not in options: |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2495 options.insert(0, value) |
|
1322
c0546b95aad1
finished off handling of retired flag in filter() [SF#635260]
Richard Jones <richard@users.sourceforge.net>
parents:
1320
diff
changeset
|
2496 |
|
4053
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2497 if additional: |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2498 additional_fns = [] |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2499 props = linkcl.getprops() |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2500 for propname in additional: |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2501 prop = props[propname] |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2502 if isinstance(prop, hyperdb.Link): |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2503 cl = self._db.getclass(prop.classname) |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2504 labelprop = cl.labelprop() |
|
5062
2ac11cc397eb
Fix arguments to 'menu cgi method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5061
diff
changeset
|
2505 fn = lambda optionid, cl=cl, linkcl=linkcl, \ |
|
4847
843886af0ea1
Reformat previous change (3e36a3bc0335) to 80 chars
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4846
diff
changeset
|
2506 propname=propname, labelprop=labelprop: \ |
|
843886af0ea1
Reformat previous change (3e36a3bc0335) to 80 chars
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4846
diff
changeset
|
2507 cl.get(linkcl.get(optionid, propname), labelprop) |
|
4053
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2508 else: |
|
5062
2ac11cc397eb
Fix arguments to 'menu cgi method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5061
diff
changeset
|
2509 fn = lambda optionid, linkcl=linkcl, propname=propname: \ |
|
4847
843886af0ea1
Reformat previous change (3e36a3bc0335) to 80 chars
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4846
diff
changeset
|
2510 linkcl.get(optionid, propname) |
|
4846
3e36a3bc0335
issue2550822: Fix showing more than one additional property in class menu
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4842
diff
changeset
|
2511 additional_fns.append(fn) |
|
4115
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
2512 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2513 for optionid in options: |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2514 # get the option value, and if it's None use an empty string |
|
6404
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
2515 try: |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
2516 option = linkcl.get(optionid, k) or '' |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
2517 except IndexError: |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
2518 # optionid does not exist. E.G. |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
2519 # IndexError: no such queue z |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
2520 # can be set using ?queue=z in URL for |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
2521 # a new issue |
|
e29d5f4e0af4
issue2551132 - Setting form value in query string --- issues
John Rouillard <rouilj@ieee.org>
parents:
6398
diff
changeset
|
2522 continue |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2523 |
|
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2524 # figure if this option is selected |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2525 s = '' |
|
5181
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2526 # record the marker for the selected item if requested |
|
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2527 selected_mark='' |
|
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2528 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2529 if value in [optionid, option]: |
|
1952
c40ed9113285
Applied Stefan Seefeld's html4/xhtml patch with some changes.
Richard Jones <richard@users.sourceforge.net>
parents:
1932
diff
changeset
|
2530 s = 'selected="selected" ' |
|
5181
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2531 if ( showdef ): |
|
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2532 selected_mark = showdef |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2533 |
|
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2534 # figure the label |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2535 if showid: |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2536 lab = '%s%s: %s'%(self._prop.classname, optionid, option) |
|
3151
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2537 elif not option: |
|
6feac4fcf883
Various bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
3127
diff
changeset
|
2538 lab = '%s%s'%(self._prop.classname, optionid) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2539 else: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2540 lab = option |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2541 |
|
5181
496f30da72f8
Add a new argument "showdef" to the template function menu(). When set
John Rouillard <rouilj@ieee.org>
parents:
5180
diff
changeset
|
2542 lab = lab + selected_mark |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2543 # truncate if it's too long |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2544 if size is not None and len(lab) > size: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2545 lab = lab[:size-3] + '...' |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2546 if additional: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2547 m = [] |
|
4053
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2548 for fn in additional_fns: |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2549 m.append(str(fn(optionid))) |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2550 lab = lab + ' (%s)'%', '.join(m) |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2551 |
|
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2552 # and generate |
|
4537
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2553 tr = str |
|
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2554 if translate: |
|
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2555 tr = self._ |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
2556 lab = html_escape(tr(lab)) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2557 l.append('<option %svalue="%s">%s</option>'%(s, optionid, lab)) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2558 l.append('</select>') |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2559 return '\n'.join(l) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2560 # def checklist(self, ...) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2561 |
|
3194
f887e55edc94
replaced MutlilinkIterator with multilinkGenerator (thanks Bob Ippolito)
Richard Jones <richard@users.sourceforge.net>
parents:
3188
diff
changeset
|
2562 |
|
3126
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
2563 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2564 class MultilinkHTMLProperty(HTMLProperty): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2565 """ Multilink HTMLProperty |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2566 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2567 Also be iterable, returning a wrapper object like the Link case for |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2568 each entry in the multilink. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2569 """ |
|
1931
f1e5e5115c29
Always sort MultilinkHTMLProperty in the correct order...
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
1917
diff
changeset
|
2570 def __init__(self, *args, **kwargs): |
|
f1e5e5115c29
Always sort MultilinkHTMLProperty in the correct order...
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
1917
diff
changeset
|
2571 HTMLProperty.__init__(self, *args, **kwargs) |
|
f1e5e5115c29
Always sort MultilinkHTMLProperty in the correct order...
Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
parents:
1917
diff
changeset
|
2572 if self._value: |
|
3270
e4607e12d030
ignore sorting errors in MultilinkHTMLProperty instantiation [SF#1177602]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3253
diff
changeset
|
2573 display_value = lookupIds(self._db, self._prop, self._value, |
|
3860
c672b15ddae6
- fix id-lookup in case we already *know* that the value is an id (in
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3857
diff
changeset
|
2574 fail_ok=1, do_lookup=False) |
|
5414
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
2575 keyfun = make_key_function(self._db, self._prop.classname) |
|
3270
e4607e12d030
ignore sorting errors in MultilinkHTMLProperty instantiation [SF#1177602]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3253
diff
changeset
|
2576 # sorting fails if the value contains |
|
e4607e12d030
ignore sorting errors in MultilinkHTMLProperty instantiation [SF#1177602]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3253
diff
changeset
|
2577 # items not yet stored in the database |
|
e4607e12d030
ignore sorting errors in MultilinkHTMLProperty instantiation [SF#1177602]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3253
diff
changeset
|
2578 # ignore these errors to preserve user input |
|
e4607e12d030
ignore sorting errors in MultilinkHTMLProperty instantiation [SF#1177602]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3253
diff
changeset
|
2579 try: |
|
5414
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
2580 display_value.sort(key=keyfun) |
|
3270
e4607e12d030
ignore sorting errors in MultilinkHTMLProperty instantiation [SF#1177602]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3253
diff
changeset
|
2581 except: |
|
e4607e12d030
ignore sorting errors in MultilinkHTMLProperty instantiation [SF#1177602]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3253
diff
changeset
|
2582 pass |
|
3271
572bbe7fa236
typo in recent fix
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3270
diff
changeset
|
2583 self._value = display_value |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
2584 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2585 def __len__(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2586 """ length of the multilink """ |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2587 return len(self._value) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2588 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2589 def __getattr__(self, attr): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2590 """ no extended attribute accesses make sense here """ |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
2591 raise AttributeError(attr) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2592 |
|
3200
d2b1a946fdf4
change ZTUtils Iterator to always iter() its sequence argument
Richard Jones <richard@users.sourceforge.net>
parents:
3198
diff
changeset
|
2593 def viewableGenerator(self, values): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2594 """Used to iterate over only the View'able items in a class.""" |
|
3198
0b7990f54778
fixed broken csv import in roundup.admin module
Richard Jones <richard@users.sourceforge.net>
parents:
3194
diff
changeset
|
2595 check = self._db.security.hasPermission |
|
0b7990f54778
fixed broken csv import in roundup.admin module
Richard Jones <richard@users.sourceforge.net>
parents:
3194
diff
changeset
|
2596 userid = self._client.userid |
|
0b7990f54778
fixed broken csv import in roundup.admin module
Richard Jones <richard@users.sourceforge.net>
parents:
3194
diff
changeset
|
2597 classname = self._prop.classname |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
2598 if check('Web Access', userid): |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
2599 for value in values: |
|
5221
24945480d24c
Iterate over multilink items if they labelprop is accessible to the
John Rouillard <rouilj@ieee.org>
parents:
5217
diff
changeset
|
2600 if check('View', userid, classname, |
|
24945480d24c
Iterate over multilink items if they labelprop is accessible to the
John Rouillard <rouilj@ieee.org>
parents:
5217
diff
changeset
|
2601 itemid=value, |
|
24945480d24c
Iterate over multilink items if they labelprop is accessible to the
John Rouillard <rouilj@ieee.org>
parents:
5217
diff
changeset
|
2602 property=self._db.getclass(classname).labelprop(default_to_id=1)): |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
2603 yield HTMLItem(self._client, classname, value) |
|
3198
0b7990f54778
fixed broken csv import in roundup.admin module
Richard Jones <richard@users.sourceforge.net>
parents:
3194
diff
changeset
|
2604 |
|
3126
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
2605 def __iter__(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2606 """ iterate and return a new HTMLItem |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2607 """ |
|
3200
d2b1a946fdf4
change ZTUtils Iterator to always iter() its sequence argument
Richard Jones <richard@users.sourceforge.net>
parents:
3198
diff
changeset
|
2608 return self.viewableGenerator(self._value) |
|
3126
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
2609 |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
2610 def reverse(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2611 """ return the list in reverse order |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2612 """ |
|
3126
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
2613 l = self._value[:] |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
2614 l.reverse() |
|
3200
d2b1a946fdf4
change ZTUtils Iterator to always iter() its sequence argument
Richard Jones <richard@users.sourceforge.net>
parents:
3198
diff
changeset
|
2615 return self.viewableGenerator(l) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2616 |
|
6414
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2617 def sorted(self, property, reverse=False, NoneFirst=False): |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2618 """ Return this multilink sorted by the given property |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2619 |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2620 Set Nonefirst to True to sort None/unset property |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2621 before a property with a valid value. |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2622 |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2623 """ |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2624 |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2625 # use 2 if NoneFirst is False to sort None last |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2626 # 0 to sort to sort None first |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2627 # 1 is used to sort the integer values. |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2628 NoneCode = (2,0)[NoneFirst] |
|
6421
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2629 |
|
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2630 value = list(self.__iter__()) |
|
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2631 |
|
6444
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2632 if not value: |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2633 # return empty list, nothing to sort. |
|
6421
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2634 return value |
|
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2635 |
|
6444
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2636 # determine orderprop for property if property is a link or multilink |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2637 prop = self._db.getclass(self._classname).getprops()[property] |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2638 if type(prop) in [hyperdb.Link, hyperdb.Multilink]: |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2639 orderprop = value[0]._db.getclass(prop.classname).orderprop() |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2640 sort_by_link = True |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2641 else: |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2642 orderprop = property |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2643 sort_by_link = False |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2644 |
|
6414
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2645 def keyfunc(v): |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2646 # Return tuples made of (group order (int), base python |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2647 # type) to sort function. |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2648 # Do not return v[property] as that returns an HTMLProperty |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2649 # type/subtype that throws an exception when sorting |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2650 # python type (int. str ...) against None. |
|
6421
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2651 prop = v[property] |
|
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2652 if not prop._value: |
|
6414
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2653 return (NoneCode, None) |
|
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2654 |
|
6444
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2655 if sort_by_link: |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2656 val = prop[orderprop]._value |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2657 else: |
|
3ca8b6145167
issue2551122 - fixing order by a link/multilink broke other props
John Rouillard <rouilj@ieee.org>
parents:
6428
diff
changeset
|
2658 val = prop._value |
|
6421
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2659 |
|
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2660 if val is None: # verify orderprop is set to a value |
|
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2661 return (NoneCode, None) |
|
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2662 return (1, val) # val should be base python type |
|
9c57f2814597
Fix issue2551122 (MultilinkHTMLProperty sorted method issue)
John Rouillard <rouilj@ieee.org>
parents:
6414
diff
changeset
|
2663 |
|
6414
3dbf1bc5e567
issue2551120 - The sorted method of MultilinkHTMLProperty crashes ...
John Rouillard <rouilj@ieee.org>
parents:
6404
diff
changeset
|
2664 value.sort(key=keyfunc, reverse=reverse) |
|
2883
1ca5ebe9b16a
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
2880
diff
changeset
|
2665 return value |
|
1ca5ebe9b16a
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
2880
diff
changeset
|
2666 |
|
1103
db787cef1385
handled some XXXs
Richard Jones <richard@users.sourceforge.net>
parents:
1099
diff
changeset
|
2667 def __contains__(self, value): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2668 """ Support the "in" operator. We have to make sure the passed-in |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2669 value is a string first, not a HTMLProperty. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2670 """ |
|
1325
2e5a9fc7abd5
allow StringHTMLProperty in MultilinkHTMLProperty test to work
Richard Jones <richard@users.sourceforge.net>
parents:
1323
diff
changeset
|
2671 return str(value) in self._value |
|
1103
db787cef1385
handled some XXXs
Richard Jones <richard@users.sourceforge.net>
parents:
1099
diff
changeset
|
2672 |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
2673 def isset(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2674 """Is my _value not []?""" |
|
2289
6d16b967f89d
HTML templating isset() inverted [SF#951779]
Richard Jones <richard@users.sourceforge.net>
parents:
2262
diff
changeset
|
2675 return self._value != [] |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
2676 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2677 def plain(self, escape=0): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2678 """ Render a "plain" representation of the property |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2679 """ |
|
3117
460eb0209a9e
Permissions improvements.
Richard Jones <richard@users.sourceforge.net>
parents:
3104
diff
changeset
|
2680 if not self.is_view_ok(): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
2681 return self._('[hidden]') |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2682 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2683 linkcl = self._db.classes[self._prop.classname] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2684 k = linkcl.labelprop(1) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2685 labels = [] |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2686 for v in self._value: |
|
4058
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2687 if num_re.match(v): |
|
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2688 try: |
|
6620
b7093aa16895
issue2551196 - Unset labelprop of a Multilink can lead to Python error when using context/history
John Rouillard <rouilj@ieee.org>
parents:
6593
diff
changeset
|
2689 label = linkcl.get(v, k, |
|
b7093aa16895
issue2551196 - Unset labelprop of a Multilink can lead to Python error when using context/history
John Rouillard <rouilj@ieee.org>
parents:
6593
diff
changeset
|
2690 default=self._("[label is missing]")) |
|
4058
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2691 except IndexError: |
|
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2692 label = None |
|
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2693 # fall back to designator if label is None |
|
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2694 if label is None: label = '%s%s'%(self._prop.classname, k) |
|
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2695 else: |
|
3057092623e1
Robustify (Multi)linkHTMLProperty.plain.
Stefan Seefeld <stefan@seefeld.name>
parents:
4057
diff
changeset
|
2696 label = v |
|
3401
62e4032cb280
merge from maint-0-8
Richard Jones <richard@users.sourceforge.net>
parents:
3394
diff
changeset
|
2697 labels.append(label) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2698 value = ', '.join(labels) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2699 if escape: |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
2700 value = html_escape(value) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2701 return value |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2702 |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2703 def field(self, size=30, showid=0, **kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2704 """ Render a form edit field for the property |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2705 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2706 If not editable, just display the value via plain(). |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2707 """ |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2708 if not self.is_edit_ok(): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2709 return self.plain(escape=1) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2710 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2711 linkcl = self._db.getclass(self._prop.classname) |
|
4339
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2712 |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2713 if 'value' not in kwargs: |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2714 value = self._value[:] |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2715 # map the id to the label property |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2716 if not linkcl.getkey(): |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2717 showid=1 |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2718 if not showid: |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2719 k = linkcl.labelprop(1) |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2720 value = lookupKeys(linkcl, k, value) |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2721 value = ','.join(value) |
|
4356
05a65559d873
undo regression in 1.4.12: Multilink edit fields lose their values
Richard Jones <richard@users.sourceforge.net>
parents:
4339
diff
changeset
|
2722 kwargs["value"] = value |
|
4339
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2723 |
|
663664c4e626
Allow value to be specified to multilink form element templating
Richard Jones <richard@users.sourceforge.net>
parents:
4333
diff
changeset
|
2724 return self.input(name=self._formname, size=size, **kwargs) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2725 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2726 def menu(self, size=None, height=None, showid=0, additional=[], |
|
4537
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2727 value=None, sort_on=None, html_kwargs={}, translate=True, |
|
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2728 **conditions): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2729 """ Render a form <select> list for this property. |
|
3127
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2730 |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2731 "size" is used to limit the length of the list labels |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2732 "height" is used to set the <select> tag's "size" attribute |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2733 "showid" includes the item ids in the list labels |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2734 "additional" lists properties which should be included in the |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2735 label |
|
3470
fd32170475f5
allow preselection of values in templating menu()s (patch [SF#1396085])
Richard Jones <richard@users.sourceforge.net>
parents:
3461
diff
changeset
|
2736 "value" specifies which item is pre-selected |
|
3127
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2737 "sort_on" indicates the property to sort the list on as |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2738 (direction, property) where direction is '+' or '-'. A |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2739 single string with the direction prepended may be used. |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2740 For example: ('-', 'order'), '+name'. |
|
3270
e4607e12d030
ignore sorting errors in MultilinkHTMLProperty instantiation [SF#1177602]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3253
diff
changeset
|
2741 |
|
3127
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2742 The remaining keyword arguments are used as conditions for |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2743 filtering the items in the list - they're passed as the |
|
021b131bd816
doc fixes, one more fix to the permissions-in-listings fix
Richard Jones <richard@users.sourceforge.net>
parents:
3126
diff
changeset
|
2744 "filterspec" argument to a Class.filter() call. |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2745 |
|
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2746 If not editable, just display the value via plain(). |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2747 """ |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2748 if not self.is_edit_ok(): |
|
3971
ff3a8b7d1819
security fixes
Richard Jones <richard@users.sourceforge.net>
parents:
3968
diff
changeset
|
2749 return self.plain(escape=1) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2750 |
|
3470
fd32170475f5
allow preselection of values in templating menu()s (patch [SF#1396085])
Richard Jones <richard@users.sourceforge.net>
parents:
3461
diff
changeset
|
2751 if value is None: |
|
fd32170475f5
allow preselection of values in templating menu()s (patch [SF#1396085])
Richard Jones <richard@users.sourceforge.net>
parents:
3461
diff
changeset
|
2752 value = self._value |
|
5548
fea11d05110e
Avoid errors from selecting "no selection" on multilink (issue2550722).
Joseph Myers <jsm@polyomino.org.uk>
parents:
5492
diff
changeset
|
2753 # When rendering from form contents, 'value' may contain |
|
fea11d05110e
Avoid errors from selecting "no selection" on multilink (issue2550722).
Joseph Myers <jsm@polyomino.org.uk>
parents:
5492
diff
changeset
|
2754 # elements starting '-' from '- no selection -' having been |
|
fea11d05110e
Avoid errors from selecting "no selection" on multilink (issue2550722).
Joseph Myers <jsm@polyomino.org.uk>
parents:
5492
diff
changeset
|
2755 # selected on a previous form submission. |
|
fea11d05110e
Avoid errors from selecting "no selection" on multilink (issue2550722).
Joseph Myers <jsm@polyomino.org.uk>
parents:
5492
diff
changeset
|
2756 value = [v for v in value if not v.startswith('-')] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2757 |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2758 linkcl = self._db.getclass(self._prop.classname) |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2759 |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2760 if sort_on is not None: |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2761 if not isinstance(sort_on, tuple): |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2762 if sort_on[0] in '+-': |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2763 sort_on = (sort_on[0], sort_on[1:]) |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2764 else: |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2765 sort_on = ('+', sort_on) |
|
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2766 else: |
| 4032 | 2767 sort_on = ('+', linkcl.orderprop()) |
|
3363
7bc1e9c42a26
allow specification of pagesize, sorting and filtering in "classhelp" popups
Richard Jones <richard@users.sourceforge.net>
parents:
3361
diff
changeset
|
2768 |
|
3565
32343bfc3da0
add permission filter to menu() implementations [SF#1431188]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3562
diff
changeset
|
2769 options = [opt |
|
32343bfc3da0
add permission filter to menu() implementations [SF#1431188]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3562
diff
changeset
|
2770 for opt in linkcl.filter(None, conditions, sort_on) |
|
32343bfc3da0
add permission filter to menu() implementations [SF#1431188]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3562
diff
changeset
|
2771 if self._db.security.hasPermission("View", self._client.userid, |
|
3594
b5b6a6f7743a
fix bug in menu() permission filter [SF#1444440]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3584
diff
changeset
|
2772 linkcl.classname, itemid=opt)] |
|
4115
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
2773 |
|
4042
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2774 # make sure we list the current values if they're retired |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2775 for val in value: |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2776 if val not in options: |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2777 options.insert(0, val) |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2778 |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2779 if not height: |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2780 height = len(options) |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2781 if value: |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2782 # The "no selection" option. |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2783 height += 1 |
|
8831882170fc
Fix height calculation for Multilink.menu()
Stefan Seefeld <stefan@seefeld.name>
parents:
4040
diff
changeset
|
2784 height = min(height, 7) |
|
5988
39b8bc511ed7
Fix html generation errors for boolean options.
John Rouillard <rouilj@ieee.org>
parents:
5973
diff
changeset
|
2785 l = ['<select multiple %s>'%self.cgi_escape_attrs(name = self._formname, |
|
4267
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2786 size = height, |
|
c5f52c2c9e36
Provide ability to specify arbitrary HTML attributes.
Stefan Seefeld <stefan@seefeld.name>
parents:
4233
diff
changeset
|
2787 **html_kwargs)] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2788 k = linkcl.labelprop(1) |
|
1322
c0546b95aad1
finished off handling of retired flag in filter() [SF#635260]
Richard Jones <richard@users.sourceforge.net>
parents:
1320
diff
changeset
|
2789 |
|
5995
b4b5b7afacd9
issue2551007 - Selection fields are not translated
John Rouillard <rouilj@ieee.org>
parents:
5991
diff
changeset
|
2790 if value: # FIXME '- no selection -' mark for translation |
|
4054
6070bc4935fa
Provide a a "no selection" option; cleanup.
Stefan Seefeld <stefan@seefeld.name>
parents:
4053
diff
changeset
|
2791 l.append('<option value="%s">- no selection -</option>' |
|
6070bc4935fa
Provide a a "no selection" option; cleanup.
Stefan Seefeld <stefan@seefeld.name>
parents:
4053
diff
changeset
|
2792 % ','.join(['-' + v for v in value])) |
|
1322
c0546b95aad1
finished off handling of retired flag in filter() [SF#635260]
Richard Jones <richard@users.sourceforge.net>
parents:
1320
diff
changeset
|
2793 |
|
4053
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2794 if additional: |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2795 additional_fns = [] |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2796 props = linkcl.getprops() |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2797 for propname in additional: |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2798 prop = props[propname] |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2799 if isinstance(prop, hyperdb.Link): |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2800 cl = self._db.getclass(prop.classname) |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2801 labelprop = cl.labelprop() |
|
5062
2ac11cc397eb
Fix arguments to 'menu cgi method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5061
diff
changeset
|
2802 fn = lambda optionid, cl=cl, linkcl=linkcl, \ |
|
4848
e8ae54db8b95
Fix issue2550822 (3e36a3bc0335 and 843886af0ea1) for multilinks, too
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4847
diff
changeset
|
2803 propname=propname, labelprop=labelprop: \ |
|
e8ae54db8b95
Fix issue2550822 (3e36a3bc0335 and 843886af0ea1) for multilinks, too
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4847
diff
changeset
|
2804 cl.get(linkcl.get(optionid, propname), labelprop) |
|
4053
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2805 else: |
|
5062
2ac11cc397eb
Fix arguments to 'menu cgi method
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5061
diff
changeset
|
2806 fn = lambda optionid, linkcl=linkcl, propname=propname: \ |
|
4848
e8ae54db8b95
Fix issue2550822 (3e36a3bc0335 and 843886af0ea1) for multilinks, too
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4847
diff
changeset
|
2807 linkcl.get(optionid, propname) |
|
e8ae54db8b95
Fix issue2550822 (3e36a3bc0335 and 843886af0ea1) for multilinks, too
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4847
diff
changeset
|
2808 additional_fns.append(fn) |
|
4115
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
2809 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2810 for optionid in options: |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2811 # get the option value, and if it's None use an empty string |
|
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2812 option = linkcl.get(optionid, k) or '' |
|
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2813 |
|
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2814 # figure if this option is selected |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2815 s = '' |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2816 if optionid in value or option in value: |
|
1952
c40ed9113285
Applied Stefan Seefeld's html4/xhtml patch with some changes.
Richard Jones <richard@users.sourceforge.net>
parents:
1932
diff
changeset
|
2817 s = 'selected="selected" ' |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2818 |
|
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2819 # figure the label |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2820 if showid: |
|
1079
04b44df7af1d
removed some property name clashes
Richard Jones <richard@users.sourceforge.net>
parents:
1078
diff
changeset
|
2821 lab = '%s%s: %s'%(self._prop.classname, optionid, option) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2822 else: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2823 lab = option |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2824 # truncate if it's too long |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2825 if size is not None and len(lab) > size: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2826 lab = lab[:size-3] + '...' |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2827 if additional: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2828 m = [] |
|
4053
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2829 for fn in additional_fns: |
|
f2030089dac6
Extend "additional" parameter to work with (multi)links.
Stefan Seefeld <stefan@seefeld.name>
parents:
4052
diff
changeset
|
2830 m.append(str(fn(optionid))) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2831 lab = lab + ' (%s)'%', '.join(m) |
|
1169
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2832 |
|
7b448a2425fd
bugfix to (multi)link menu() label generation
Richard Jones <richard@users.sourceforge.net>
parents:
1163
diff
changeset
|
2833 # and generate |
|
4537
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2834 tr = str |
|
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2835 if translate: |
|
61cd652da1cd
Allow to turn off translation of generated html options in menu method...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4524
diff
changeset
|
2836 tr = self._ |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
2837 lab = html_escape(tr(lab)) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2838 l.append('<option %svalue="%s">%s</option>'%(s, optionid, |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2839 lab)) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2840 l.append('</select>') |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2841 return '\n'.join(l) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2842 |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2843 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2844 # set the propclasses for HTMLItem |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2845 propclasses = [ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2846 (hyperdb.String, StringHTMLProperty), |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2847 (hyperdb.Number, NumberHTMLProperty), |
|
5067
e424987d294a
Add support for an integer type to join the existing number type.
John Rouillard <rouilj@ieee.org>
parents:
5062
diff
changeset
|
2848 (hyperdb.Integer, IntegerHTMLProperty), |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2849 (hyperdb.Boolean, BooleanHTMLProperty), |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2850 (hyperdb.Date, DateHTMLProperty), |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2851 (hyperdb.Interval, IntervalHTMLProperty), |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2852 (hyperdb.Password, PasswordHTMLProperty), |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2853 (hyperdb.Link, LinkHTMLProperty), |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2854 (hyperdb.Multilink, MultilinkHTMLProperty), |
|
4396
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2855 ] |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2856 |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2857 def register_propclass(prop, cls): |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2858 for index,propclass in enumerate(propclasses): |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2859 p, c = propclass |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2860 if prop == p: |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2861 propclasses[index] = (prop, cls) |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2862 break |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2863 else: |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2864 propclasses.append((prop, cls)) |
|
172489ea9e07
allow trackers to override the classes used to render properties...
Richard Jones <richard@users.sourceforge.net>
parents:
4391
diff
changeset
|
2865 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2866 |
|
5414
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
2867 def make_key_function(db, classname, sort_on=None): |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
2868 """Make a sort key function for a given class. |
|
4417
cc36be59ebd8
make sort more robust
Richard Jones <richard@users.sourceforge.net>
parents:
4413
diff
changeset
|
2869 |
|
cc36be59ebd8
make sort more robust
Richard Jones <richard@users.sourceforge.net>
parents:
4413
diff
changeset
|
2870 The list being sorted may contain mixed ids and labels. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2871 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2872 linkcl = db.getclass(classname) |
|
1983
75437090134e
implement built-in permission checks for rendered fields...
Richard Jones <richard@users.sourceforge.net>
parents:
1956
diff
changeset
|
2873 if sort_on is None: |
| 4032 | 2874 sort_on = linkcl.orderprop() |
|
5414
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
2875 def keyfunc(a): |
|
4417
cc36be59ebd8
make sort more robust
Richard Jones <richard@users.sourceforge.net>
parents:
4413
diff
changeset
|
2876 if num_re.match(a): |
|
cc36be59ebd8
make sort more robust
Richard Jones <richard@users.sourceforge.net>
parents:
4413
diff
changeset
|
2877 a = linkcl.get(a, sort_on) |
|
6689
994893cf3e1a
Fix traceback if an order attribute is None
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6658
diff
changeset
|
2878 # In Python3 we may not compare strings and None |
|
994893cf3e1a
Fix traceback if an order attribute is None
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6658
diff
changeset
|
2879 if a is None : |
|
994893cf3e1a
Fix traceback if an order attribute is None
Ralf Schlatterbeck <rsc@runtux.com>
parents:
6658
diff
changeset
|
2880 return '' |
|
5414
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
2881 return a |
|
3fa026621f69
Python 3 preparation: comparisons.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5404
diff
changeset
|
2882 return keyfunc |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2883 |
|
1202
01a143f9382e
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
1201
diff
changeset
|
2884 def handleListCGIValue(value): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2885 """ Value is either a single item or a list of items. Each item has a |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2886 .value that we're actually interested in. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2887 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2888 if isinstance(value, type([])): |
|
1202
01a143f9382e
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
1201
diff
changeset
|
2889 return [value.value for value in value] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2890 else: |
|
1104
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
2891 value = value.value.strip() |
|
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
2892 if not value: |
|
d759c3cb1f06
Remeber values in edit/new submission error pages.
Richard Jones <richard@users.sourceforge.net>
parents:
1103
diff
changeset
|
2893 return [] |
|
3972
eee76dd4a09f
'Make a Copy' failed with more than one person in nosy list [SF#1906147]
Richard Jones <richard@users.sourceforge.net>
parents:
3971
diff
changeset
|
2894 return [v.strip() for v in value.split(',')] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2895 |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
2896 class HTMLRequest(HTMLInputMixin): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2897 """The *request*, holding the CGI form and environment. |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2898 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2899 - "form" the CGI form as a cgi.FieldStorage |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2900 - "env" the CGI environment variables |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2901 - "base" the base URL for this instance |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
2902 - "user" a HTMLItem instance for this user |
|
3968
5857cd1a0db9
add language to the "request" template var
Richard Jones <richard@users.sourceforge.net>
parents:
3936
diff
changeset
|
2903 - "language" as determined by the browser or config |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2904 - "classname" the current classname (possibly None) |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2905 - "template" the current template (suffix, also possibly None) |
|
1004
5f12d3259f31
logout works better now
Richard Jones <richard@users.sourceforge.net>
parents:
1003
diff
changeset
|
2906 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2907 Index args: |
|
1004
5f12d3259f31
logout works better now
Richard Jones <richard@users.sourceforge.net>
parents:
1003
diff
changeset
|
2908 |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2909 - "columns" dictionary of the columns to display in an index page |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2910 - "show" a convenience access to columns - request/show/colname will |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2911 be true if the columns should be displayed, false otherwise |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2912 - "sort" index sort column (direction, column name) |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2913 - "group" index grouping property (direction, column name) |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2914 - "filter" properties to filter the index on |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2915 - "filterspec" values to filter the index on |
|
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
2002
diff
changeset
|
2916 - "search_text" text to perform a full-text search on for an index |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2917 """ |
|
3505
b294cc477f2c
ZRoundup works again [SF#1263842]
Richard Jones <richard@users.sourceforge.net>
parents:
3479
diff
changeset
|
2918 def __repr__(self): |
|
3736
a2d22d0de0bc
WSGI support via roundup.cgi.wsgi_handler
Richard Jones <richard@users.sourceforge.net>
parents:
3710
diff
changeset
|
2919 return '<HTMLRequest %r>'%self.__dict__ |
|
3505
b294cc477f2c
ZRoundup works again [SF#1263842]
Richard Jones <richard@users.sourceforge.net>
parents:
3479
diff
changeset
|
2920 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2921 def __init__(self, client): |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
2922 # _client is needed by HTMLInputMixin |
|
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
2923 self._client = self.client = client |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2924 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2925 # easier access vars |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2926 self.form = client.form |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2927 self.env = client.env |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2928 self.base = client.base |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
2929 self.user = HTMLItem(client, 'user', client.userid) |
|
3968
5857cd1a0db9
add language to the "request" template var
Richard Jones <richard@users.sourceforge.net>
parents:
3936
diff
changeset
|
2930 self.language = client.language |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2931 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2932 # store the current class name and action |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2933 self.classname = client.classname |
|
3584
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2934 self.nodeid = client.nodeid |
|
1041
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
2935 self.template = client.template |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2936 |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2937 # the special char to use for special vars |
|
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2938 self.special_char = '@' |
|
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2939 |
|
1956
1e2cccf6b53b
give access to the input() method all over the place
Richard Jones <richard@users.sourceforge.net>
parents:
1952
diff
changeset
|
2940 HTMLInputMixin.__init__(self) |
|
1952
c40ed9113285
Applied Stefan Seefeld's html4/xhtml patch with some changes.
Richard Jones <richard@users.sourceforge.net>
parents:
1932
diff
changeset
|
2941 |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
2942 self._post_init() |
|
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
2943 |
|
3584
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2944 def current_url(self): |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2945 url = self.base |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2946 if self.classname: |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2947 url += self.classname |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2948 if self.nodeid: |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2949 url += self.nodeid |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2950 args = {} |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2951 if self.template: |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2952 args['@template'] = self.template |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2953 return self.indexargs_url(url, args) |
|
35b35a152b40
fix "clear this message" [SF#1429367]
Richard Jones <richard@users.sourceforge.net>
parents:
3582
diff
changeset
|
2954 |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2955 def _parse_sort(self, var, name): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2956 """ Parse sort/group options. Append to var |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
2957 """ |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2958 fields = [] |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2959 dirs = [] |
|
3698
c2d232b377d5
optimize parsing of sort/group options according to suggestion...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3696
diff
changeset
|
2960 for special in '@:': |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2961 idx = 0 |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2962 key = '%s%s%d'%(special, name, idx) |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
2963 while self._form_has_key(key): |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2964 self.special_char = special |
|
4040
b6a2251394dd
Make cgi.templating more fault-tolerant towards invalid requests.
Stefan Seefeld <stefan@seefeld.name>
parents:
4032
diff
changeset
|
2965 fields.append(self.form.getfirst(key)) |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2966 dirkey = '%s%sdir%d'%(special, name, idx) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2967 if dirkey in self.form: |
|
4040
b6a2251394dd
Make cgi.templating more fault-tolerant towards invalid requests.
Stefan Seefeld <stefan@seefeld.name>
parents:
4032
diff
changeset
|
2968 dirs.append(self.form.getfirst(dirkey)) |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2969 else: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2970 dirs.append(None) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2971 idx += 1 |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2972 key = '%s%s%d'%(special, name, idx) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2973 # backward compatible (and query) URL format |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2974 key = special + name |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2975 dirkey = key + 'dir' |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
2976 if self._form_has_key(key) and not fields: |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2977 fields = handleListCGIValue(self.form[key]) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2978 if dirkey in self.form: |
|
4040
b6a2251394dd
Make cgi.templating more fault-tolerant towards invalid requests.
Stefan Seefeld <stefan@seefeld.name>
parents:
4032
diff
changeset
|
2979 dirs.append(self.form.getfirst(dirkey)) |
|
3698
c2d232b377d5
optimize parsing of sort/group options according to suggestion...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3696
diff
changeset
|
2980 if fields: # only try other special char if nothing found |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2981 break |
| 5095 | 2982 |
| 2983 # sometimes requests come in without a class | |
| 2984 # chances are they won't have any filter params, | |
| 2985 # in that case anyway but... | |
| 2986 if self.classname: | |
| 2987 cls = self.client.db.getclass(self.classname) | |
|
5399
dccae35caa59
Python 3 preparation: update map() calls as needed.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5395
diff
changeset
|
2988 for f, d in zip_longest(fields, dirs): |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2989 if f.startswith('-'): |
|
5094
92d33d3125a0
Validate properties specified for sorting and grouping in index
John Rouillard <rouilj@ieee.org>
parents:
5087
diff
changeset
|
2990 dir, propname = '-', f[1:] |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2991 elif d: |
|
5094
92d33d3125a0
Validate properties specified for sorting and grouping in index
John Rouillard <rouilj@ieee.org>
parents:
5087
diff
changeset
|
2992 dir, propname = '-', f |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
2993 else: |
|
5094
92d33d3125a0
Validate properties specified for sorting and grouping in index
John Rouillard <rouilj@ieee.org>
parents:
5087
diff
changeset
|
2994 dir, propname = '+', f |
| 5095 | 2995 # if no classname, just append the propname unchecked. |
| 2996 # this may be valid for some actions that bypass classes. | |
| 2997 if self.classname and cls.get_transitive_prop(propname) is None: | |
|
5094
92d33d3125a0
Validate properties specified for sorting and grouping in index
John Rouillard <rouilj@ieee.org>
parents:
5087
diff
changeset
|
2998 self.client.add_error_message("Unknown %s property %s"%(name, propname)) |
|
92d33d3125a0
Validate properties specified for sorting and grouping in index
John Rouillard <rouilj@ieee.org>
parents:
5087
diff
changeset
|
2999 else: |
|
92d33d3125a0
Validate properties specified for sorting and grouping in index
John Rouillard <rouilj@ieee.org>
parents:
5087
diff
changeset
|
3000 var.append((dir, propname)) |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3001 |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3002 def _form_has_key(self, name): |
|
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3003 try: |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3004 return name in self.form |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3005 except TypeError: |
|
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3006 pass |
|
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3007 return False |
|
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3008 |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
3009 def _post_init(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3010 """ Set attributes based on self.form |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3011 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3012 # extract the index display information from the form |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3013 self.columns = [] |
|
1436
2f6647cf5345
bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents:
1421
diff
changeset
|
3014 for name in ':columns @columns'.split(): |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3015 if self._form_has_key(name): |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3016 self.special_char = name[0] |
|
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3017 self.columns = handleListCGIValue(self.form[name]) |
|
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3018 break |
|
2983
9614a101b68f
Stuff from the train ride this morning:
Richard Jones <richard@users.sourceforge.net>
parents:
2962
diff
changeset
|
3019 self.show = support.TruthDict(self.columns) |
|
4437
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
3020 security = self._client.db.security |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
3021 userid = self._client.userid |
| 1002 | 3022 |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3023 # sorting and grouping |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3024 self.sort = [] |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3025 self.group = [] |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3026 self._parse_sort(self.sort, 'sort') |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3027 self._parse_sort(self.group, 'group') |
|
4437
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
3028 self.sort = security.filterSortspec(userid, self.classname, self.sort) |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
3029 self.group = security.filterSortspec(userid, self.classname, self.group) |
| 1002 | 3030 |
| 3031 # filtering | |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3032 self.filter = [] |
|
1436
2f6647cf5345
bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents:
1421
diff
changeset
|
3033 for name in ':filter @filter'.split(): |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3034 if self._form_has_key(name): |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3035 self.special_char = name[0] |
|
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3036 self.filter = handleListCGIValue(self.form[name]) |
|
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3037 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3038 self.filterspec = {} |
|
1200
0a7bd082b94a
usability improvements in API
Richard Jones <richard@users.sourceforge.net>
parents:
1183
diff
changeset
|
3039 db = self.client.db |
|
1003
f89b8d32291b
Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents:
1002
diff
changeset
|
3040 if self.classname is not None: |
|
3635
53987aa153d2
Transitive-property support.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3610
diff
changeset
|
3041 cls = db.getclass (self.classname) |
|
1003
f89b8d32291b
Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents:
1002
diff
changeset
|
3042 for name in self.filter: |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3043 if not self._form_has_key(name): |
|
1631
8a908bbad1ef
A couple of form value handling changes:
Richard Jones <richard@users.sourceforge.net>
parents:
1591
diff
changeset
|
3044 continue |
|
3635
53987aa153d2
Transitive-property support.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3610
diff
changeset
|
3045 prop = cls.get_transitive_prop (name) |
|
1631
8a908bbad1ef
A couple of form value handling changes:
Richard Jones <richard@users.sourceforge.net>
parents:
1591
diff
changeset
|
3046 fv = self.form[name] |
|
8a908bbad1ef
A couple of form value handling changes:
Richard Jones <richard@users.sourceforge.net>
parents:
1591
diff
changeset
|
3047 if (isinstance(prop, hyperdb.Link) or |
|
8a908bbad1ef
A couple of form value handling changes:
Richard Jones <richard@users.sourceforge.net>
parents:
1591
diff
changeset
|
3048 isinstance(prop, hyperdb.Multilink)): |
|
8a908bbad1ef
A couple of form value handling changes:
Richard Jones <richard@users.sourceforge.net>
parents:
1591
diff
changeset
|
3049 self.filterspec[name] = lookupIds(db, prop, |
|
8a908bbad1ef
A couple of form value handling changes:
Richard Jones <richard@users.sourceforge.net>
parents:
1591
diff
changeset
|
3050 handleListCGIValue(fv)) |
|
8a908bbad1ef
A couple of form value handling changes:
Richard Jones <richard@users.sourceforge.net>
parents:
1591
diff
changeset
|
3051 else: |
|
8a908bbad1ef
A couple of form value handling changes:
Richard Jones <richard@users.sourceforge.net>
parents:
1591
diff
changeset
|
3052 if isinstance(fv, type([])): |
|
8a908bbad1ef
A couple of form value handling changes:
Richard Jones <richard@users.sourceforge.net>
parents:
1591
diff
changeset
|
3053 self.filterspec[name] = [v.value for v in fv] |
|
3461
fb82ab9461b0
fix comma-separated ID filter spec in web requests [SF#1396278]
Richard Jones <richard@users.sourceforge.net>
parents:
3401
diff
changeset
|
3054 elif name == 'id': |
|
fb82ab9461b0
fix comma-separated ID filter spec in web requests [SF#1396278]
Richard Jones <richard@users.sourceforge.net>
parents:
3401
diff
changeset
|
3055 # special case "id" property |
|
fb82ab9461b0
fix comma-separated ID filter spec in web requests [SF#1396278]
Richard Jones <richard@users.sourceforge.net>
parents:
3401
diff
changeset
|
3056 self.filterspec[name] = handleListCGIValue(fv) |
|
1003
f89b8d32291b
Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents:
1002
diff
changeset
|
3057 else: |
|
f89b8d32291b
Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents:
1002
diff
changeset
|
3058 self.filterspec[name] = fv.value |
|
4437
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
3059 self.filterspec = security.filterFilterspec(userid, self.classname, |
|
261c9f913ff7
- Add explicit "Search" permissions, see Security Fix below.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4417
diff
changeset
|
3060 self.filterspec) |
| 1002 | 3061 |
| 3062 # full-text search argument | |
| 3063 self.search_text = None | |
|
1436
2f6647cf5345
bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents:
1421
diff
changeset
|
3064 for name in ':search_text @search_text'.split(): |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3065 if self._form_has_key(name): |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3066 self.special_char = name[0] |
|
4040
b6a2251394dd
Make cgi.templating more fault-tolerant towards invalid requests.
Stefan Seefeld <stefan@seefeld.name>
parents:
4032
diff
changeset
|
3067 self.search_text = self.form.getfirst(name) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3068 |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3069 # pagination - size and start index |
|
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3070 # figure batch args |
|
3158
cf824afdb76b
*cough* nothing to see here
Richard Jones <richard@users.sourceforge.net>
parents:
3157
diff
changeset
|
3071 self.pagesize = 50 |
|
1436
2f6647cf5345
bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents:
1421
diff
changeset
|
3072 for name in ':pagesize @pagesize'.split(): |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3073 if self._form_has_key(name): |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3074 self.special_char = name[0] |
|
4115
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3075 try: |
|
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3076 self.pagesize = int(self.form.getfirst(name)) |
|
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3077 except ValueError: |
|
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3078 # not an integer - ignore |
|
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3079 pass |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3080 |
|
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3081 self.startwith = 0 |
|
1436
2f6647cf5345
bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents:
1421
diff
changeset
|
3082 for name in ':startwith @startwith'.split(): |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3083 if self._form_has_key(name): |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3084 self.special_char = name[0] |
|
4115
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3085 try: |
|
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3086 self.startwith = int(self.form.getfirst(name)) |
|
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3087 except ValueError: |
|
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3088 # not an integer - ignore |
|
d61066deae67
handle bogus pagination values (issue 2550530)
Richard Jones <richard@users.sourceforge.net>
parents:
4112
diff
changeset
|
3089 pass |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3090 |
|
3549
f6719836e521
allow dispname to be passed to renderWith [SF#1424587]
Richard Jones <richard@users.sourceforge.net>
parents:
3535
diff
changeset
|
3091 # dispname |
|
4804
bc4144417861
More fixes for form TypeError
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4791
diff
changeset
|
3092 if self._form_has_key('@dispname'): |
|
4040
b6a2251394dd
Make cgi.templating more fault-tolerant towards invalid requests.
Stefan Seefeld <stefan@seefeld.name>
parents:
4032
diff
changeset
|
3093 self.dispname = self.form.getfirst('@dispname') |
|
3689
c28d94070403
fix: HTMLRequest.dispname must be string,
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3665
diff
changeset
|
3094 else: |
|
c28d94070403
fix: HTMLRequest.dispname must be string,
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
3665
diff
changeset
|
3095 self.dispname = None |
|
3549
f6719836e521
allow dispname to be passed to renderWith [SF#1424587]
Richard Jones <richard@users.sourceforge.net>
parents:
3535
diff
changeset
|
3096 |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
3097 def updateFromURL(self, url): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3098 """ Parse the URL for query args, and update my attributes using the |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
3099 values. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3100 """ |
|
1693
7218be26cf85
attempt to fix query editing
Richard Jones <richard@users.sourceforge.net>
parents:
1633
diff
changeset
|
3101 env = {'QUERY_STRING': url} |
|
7218be26cf85
attempt to fix query editing
Richard Jones <richard@users.sourceforge.net>
parents:
1633
diff
changeset
|
3102 self.form = cgi.FieldStorage(environ=env) |
|
7218be26cf85
attempt to fix query editing
Richard Jones <richard@users.sourceforge.net>
parents:
1633
diff
changeset
|
3103 |
|
1097
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
3104 self._post_init() |
|
98f3d41f41d9
query "editing" now working, minus filling the form in with the query params
Richard Jones <richard@users.sourceforge.net>
parents:
1096
diff
changeset
|
3105 |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3106 def update(self, kwargs): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3107 """ Update my attributes using the keyword args |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3108 """ |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3109 self.__dict__.update(kwargs) |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3110 if 'columns' in kwargs: |
|
2983
9614a101b68f
Stuff from the train ride this morning:
Richard Jones <richard@users.sourceforge.net>
parents:
2962
diff
changeset
|
3111 self.show = support.TruthDict(self.columns) |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3112 |
|
1061
7f9b942128a3
nicer page title
Richard Jones <richard@users.sourceforge.net>
parents:
1051
diff
changeset
|
3113 def description(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3114 """ Return a description of the request - handle for the page title. |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3115 """ |
|
1096
fa7df238e2d4
More cleaning up of configuration, and the "instance" -> "tracker" renaming.
Richard Jones <richard@users.sourceforge.net>
parents:
1080
diff
changeset
|
3116 s = [self.client.db.config.TRACKER_NAME] |
|
1061
7f9b942128a3
nicer page title
Richard Jones <richard@users.sourceforge.net>
parents:
1051
diff
changeset
|
3117 if self.classname: |
|
7f9b942128a3
nicer page title
Richard Jones <richard@users.sourceforge.net>
parents:
1051
diff
changeset
|
3118 if self.client.nodeid: |
|
7f9b942128a3
nicer page title
Richard Jones <richard@users.sourceforge.net>
parents:
1051
diff
changeset
|
3119 s.append('- %s%s'%(self.classname, self.client.nodeid)) |
|
7f9b942128a3
nicer page title
Richard Jones <richard@users.sourceforge.net>
parents:
1051
diff
changeset
|
3120 else: |
|
1123
644d3075c2df
more documentation, fixed bug in request/description
Richard Jones <richard@users.sourceforge.net>
parents:
1122
diff
changeset
|
3121 if self.template == 'item': |
|
644d3075c2df
more documentation, fixed bug in request/description
Richard Jones <richard@users.sourceforge.net>
parents:
1122
diff
changeset
|
3122 s.append('- new %s'%self.classname) |
|
644d3075c2df
more documentation, fixed bug in request/description
Richard Jones <richard@users.sourceforge.net>
parents:
1122
diff
changeset
|
3123 elif self.template == 'index': |
|
644d3075c2df
more documentation, fixed bug in request/description
Richard Jones <richard@users.sourceforge.net>
parents:
1122
diff
changeset
|
3124 s.append('- %s index'%self.classname) |
|
644d3075c2df
more documentation, fixed bug in request/description
Richard Jones <richard@users.sourceforge.net>
parents:
1122
diff
changeset
|
3125 else: |
|
644d3075c2df
more documentation, fixed bug in request/description
Richard Jones <richard@users.sourceforge.net>
parents:
1122
diff
changeset
|
3126 s.append('- %s %s'%(self.classname, self.template)) |
|
1061
7f9b942128a3
nicer page title
Richard Jones <richard@users.sourceforge.net>
parents:
1051
diff
changeset
|
3127 else: |
|
7f9b942128a3
nicer page title
Richard Jones <richard@users.sourceforge.net>
parents:
1051
diff
changeset
|
3128 s.append('- home') |
|
7f9b942128a3
nicer page title
Richard Jones <richard@users.sourceforge.net>
parents:
1051
diff
changeset
|
3129 return ' '.join(s) |
|
7f9b942128a3
nicer page title
Richard Jones <richard@users.sourceforge.net>
parents:
1051
diff
changeset
|
3130 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3131 def __str__(self): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3132 d = {} |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3133 d.update(self.__dict__) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3134 f = '' |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3135 for k in self.form.keys(): |
|
1202
01a143f9382e
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
1201
diff
changeset
|
3136 f += '\n %r=%r'%(k,handleListCGIValue(self.form[k])) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3137 d['form'] = f |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3138 e = '' |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3139 for k,v in self.env.items(): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3140 e += '\n %r=%r'%(k, v) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3141 d['env'] = e |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3142 return """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3143 form: %(form)s |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3144 base: %(base)r |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3145 classname: %(classname)r |
|
1041
c28603c9f831
Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents:
1030
diff
changeset
|
3146 template: %(template)r |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3147 columns: %(columns)r |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3148 sort: %(sort)r |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3149 group: %(group)r |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3150 filter: %(filter)r |
|
1016
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3151 search_text: %(search_text)r |
|
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3152 pagesize: %(pagesize)r |
|
d6c13142e7b9
Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents:
1008
diff
changeset
|
3153 startwith: %(startwith)r |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3154 env: %(env)s |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3155 """%d |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3156 |
| 1002 | 3157 def indexargs_form(self, columns=1, sort=1, group=1, filter=1, |
|
5082
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3158 filterspec=1, search_text=1, exclude=[]): |
|
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3159 """ return the current index args as form elements |
|
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3160 |
|
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3161 This routine generates an html form with hidden elements. |
|
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3162 If you want to have visible form elements in your tal/jinja |
|
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3163 generated templates use the exclude aray to list the names for |
|
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3164 these elements. This wll prevent the function from creating |
|
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3165 these elements in its output. |
|
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3166 """ |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3167 l = [] |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3168 sc = self.special_char |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3169 def add(k, v): |
|
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3170 l.append(self.input(type="hidden", name=k, value=v)) |
| 1002 | 3171 if columns and self.columns: |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3172 add(sc+'columns', ','.join(self.columns)) |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3173 if sort: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3174 val = [] |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3175 for dir, attr in self.sort: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3176 if dir == '-': |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3177 val.append('-'+attr) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3178 else: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3179 val.append(attr) |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3180 add(sc+'sort', ','.join (val)) |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3181 if group: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3182 val = [] |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3183 for dir, attr in self.group: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3184 if dir == '-': |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3185 val.append('-'+attr) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3186 else: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3187 val.append(attr) |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3188 add(sc+'group', ','.join (val)) |
| 1002 | 3189 if filter and self.filter: |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3190 add(sc+'filter', ','.join(self.filter)) |
|
3068
c4e76c84f43d
another fix to indexargs
Richard Jones <richard@users.sourceforge.net>
parents:
3060
diff
changeset
|
3191 if self.classname and filterspec: |
|
4051
047402c4ec9b
Handle transitive properties.
Stefan Seefeld <stefan@seefeld.name>
parents:
4043
diff
changeset
|
3192 cls = self.client.db.getclass(self.classname) |
| 1002 | 3193 for k,v in self.filterspec.items(): |
|
5082
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3194 if k in exclude: |
|
c1f1465d5303
issue2550683 Allow indexargs_form filter variable exclusion.
John Rouillard <rouilj@ieee.org>
parents:
5067
diff
changeset
|
3195 continue |
|
1353
013ae8c6c8b1
display of saved queries is now performed correctly
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1342
diff
changeset
|
3196 if type(v) == type([]): |
|
5184
a40ea636a2ad
Issue2550934 - templating.py-indexargs_form() returns id's as space separated list not comma separated
John Rouillard <rouilj@ieee.org>
parents:
5183
diff
changeset
|
3197 # id's are stored as strings but should be treated |
|
a40ea636a2ad
Issue2550934 - templating.py-indexargs_form() returns id's as space separated list not comma separated
John Rouillard <rouilj@ieee.org>
parents:
5183
diff
changeset
|
3198 # as integers in lists. |
|
a40ea636a2ad
Issue2550934 - templating.py-indexargs_form() returns id's as space separated list not comma separated
John Rouillard <rouilj@ieee.org>
parents:
5183
diff
changeset
|
3199 if (isinstance(cls.get_transitive_prop(k), hyperdb.String) |
|
a40ea636a2ad
Issue2550934 - templating.py-indexargs_form() returns id's as space separated list not comma separated
John Rouillard <rouilj@ieee.org>
parents:
5183
diff
changeset
|
3200 and k != 'id'): |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3201 add(k, ' '.join(v)) |
|
3049
393f6ab17c07
handle spaces in String index params in batching [SF#1054224]
Richard Jones <richard@users.sourceforge.net>
parents:
3040
diff
changeset
|
3202 else: |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3203 add(k, ','.join(v)) |
|
1353
013ae8c6c8b1
display of saved queries is now performed correctly
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1342
diff
changeset
|
3204 else: |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3205 add(k, v) |
|
3159
b2fc512f145d
allow suppression of search_text in indexargs_form [SF#1101548]
Richard Jones <richard@users.sourceforge.net>
parents:
3158
diff
changeset
|
3206 if search_text and self.search_text: |
|
3782
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3207 add(sc+'search_text', self.search_text) |
|
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3208 add(sc+'pagesize', self.pagesize) |
|
51c07c04d258
clean up input field generation and quoting of values [SF#1615616]
Richard Jones <richard@users.sourceforge.net>
parents:
3779
diff
changeset
|
3209 add(sc+'startwith', self.startwith) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3210 return '\n'.join(l) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3211 |
|
1124
1fc1f92c5f31
more doc, bugfix in Batch
Richard Jones <richard@users.sourceforge.net>
parents:
1123
diff
changeset
|
3212 def indexargs_url(self, url, args): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3213 """ Embed the current index args in a URL |
| 5192 | 3214 |
| 3215 If the value of an arg (in args dict) is None, | |
| 3216 the argument is excluded from the url. If you want | |
| 3217 an empty value use an empty string '' as the value. | |
| 3218 Use this in templates to conditionally | |
| 3219 include an arg if it is set to a value. E.G. | |
| 3220 {..., '@queryname': request.dispname or None, ...} | |
| 3221 will include @queryname in the url if there is a | |
| 3222 dispname otherwise the parameter will be omitted | |
| 3223 from the url. | |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3224 """ |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5399
diff
changeset
|
3225 q = urllib_.quote |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3226 sc = self.special_char |
|
5438
e2382945d302
Python 3 preparation: avoid basestring.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5423
diff
changeset
|
3227 l = ['%s=%s'%(k,is_us(v) and q(v) or v) |
| 5192 | 3228 for k,v in args.items() if v != None ] |
|
1467
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3229 # pull out the special values (prefixed by @ or :) |
|
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3230 specials = {} |
|
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3231 for key in args.keys(): |
|
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3232 if key[0] in '@:': |
|
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3233 specials[key[1:]] = args[key] |
|
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3234 |
|
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3235 # ok, now handle the specials we received in the request |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3236 if self.columns and 'columns' not in specials: |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3237 l.append(sc+'columns=%s'%(','.join(self.columns))) |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3238 if self.sort and 'sort' not in specials: |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3239 val = [] |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3240 for dir, attr in self.sort: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3241 if dir == '-': |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3242 val.append('-'+attr) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3243 else: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3244 val.append(attr) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3245 l.append(sc+'sort=%s'%(','.join(val))) |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3246 if self.group and 'group' not in specials: |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3247 val = [] |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3248 for dir, attr in self.group: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3249 if dir == '-': |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3250 val.append('-'+attr) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3251 else: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3252 val.append(attr) |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3253 l.append(sc+'group=%s'%(','.join(val))) |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3254 if self.filter and 'filter' not in specials: |
|
1421
90bb11eb40dc
oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
3255 l.append(sc+'filter=%s'%(','.join(self.filter))) |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3256 if self.search_text and 'search_text' not in specials: |
|
3104
97aec6907e69
merge from 0.7
Richard Jones <richard@users.sourceforge.net>
parents:
3068
diff
changeset
|
3257 l.append(sc+'search_text=%s'%q(self.search_text)) |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3258 if 'pagesize' not in specials: |
|
1467
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3259 l.append(sc+'pagesize=%s'%self.pagesize) |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3260 if 'startwith' not in specials: |
|
1467
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3261 l.append(sc+'startwith=%s'%self.startwith) |
|
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3262 |
|
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1463
diff
changeset
|
3263 # finally, the remainder of the filter args in the request |
|
3068
c4e76c84f43d
another fix to indexargs
Richard Jones <richard@users.sourceforge.net>
parents:
3060
diff
changeset
|
3264 if self.classname and self.filterspec: |
|
3635
53987aa153d2
Transitive-property support.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3610
diff
changeset
|
3265 cls = self.client.db.getclass(self.classname) |
|
3068
c4e76c84f43d
another fix to indexargs
Richard Jones <richard@users.sourceforge.net>
parents:
3060
diff
changeset
|
3266 for k,v in self.filterspec.items(): |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3267 if k not in args: |
|
3068
c4e76c84f43d
another fix to indexargs
Richard Jones <richard@users.sourceforge.net>
parents:
3060
diff
changeset
|
3268 if type(v) == type([]): |
|
3635
53987aa153d2
Transitive-property support.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3610
diff
changeset
|
3269 prop = cls.get_transitive_prop(k) |
|
3909
e89bcb28f683
indexargs_url force ids to int
Justus Pendleton <jpend@users.sourceforge.net>
parents:
3905
diff
changeset
|
3270 if k != 'id' and isinstance(prop, hyperdb.String): |
|
3068
c4e76c84f43d
another fix to indexargs
Richard Jones <richard@users.sourceforge.net>
parents:
3060
diff
changeset
|
3271 l.append('%s=%s'%(k, '%20'.join([q(i) for i in v]))) |
|
c4e76c84f43d
another fix to indexargs
Richard Jones <richard@users.sourceforge.net>
parents:
3060
diff
changeset
|
3272 else: |
|
c4e76c84f43d
another fix to indexargs
Richard Jones <richard@users.sourceforge.net>
parents:
3060
diff
changeset
|
3273 l.append('%s=%s'%(k, ','.join([q(i) for i in v]))) |
|
3049
393f6ab17c07
handle spaces in String index params in batching [SF#1054224]
Richard Jones <richard@users.sourceforge.net>
parents:
3040
diff
changeset
|
3274 else: |
|
3068
c4e76c84f43d
another fix to indexargs
Richard Jones <richard@users.sourceforge.net>
parents:
3060
diff
changeset
|
3275 l.append('%s=%s'%(k, q(v))) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3276 return '%s?%s'%(url, '&'.join(l)) |
|
1124
1fc1f92c5f31
more doc, bugfix in Batch
Richard Jones <richard@users.sourceforge.net>
parents:
1123
diff
changeset
|
3277 indexargs_href = indexargs_url |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3278 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3279 def base_javascript(self): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3280 return """ |
|
5217
17b213eab274
Add nonce to embedded script references.
John Rouillard <rouilj@ieee.org>
parents:
5211
diff
changeset
|
3281 <script nonce="%s" type="text/javascript"> |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3282 submitted = false; |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3283 function submit_once() { |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3284 if (submitted) { |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3285 alert("Your request is being processed.\\nPlease be patient."); |
|
5172
fac171f0f27b
Fix submit_once Javascript function
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5166
diff
changeset
|
3286 return false; |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3287 } |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3288 submitted = true; |
|
5172
fac171f0f27b
Fix submit_once Javascript function
Ralf Schlatterbeck <rsc@runtux.com>
parents:
5166
diff
changeset
|
3289 return true; |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3290 } |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3291 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3292 function help_window(helpurl, width, height) { |
|
1204
b862bbf2067a
Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents:
1202
diff
changeset
|
3293 HelpWin = window.open('%s' + helpurl, 'RoundupHelpWindow', 'scrollbars=yes,resizable=yes,toolbar=no,height='+height+',width='+width); |
|
5006
bb97f61e1b73
Help-Window now gets focus
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4959
diff
changeset
|
3294 HelpWin.focus () |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3295 } |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3296 </script> |
|
5217
17b213eab274
Add nonce to embedded script references.
John Rouillard <rouilj@ieee.org>
parents:
5211
diff
changeset
|
3297 """%(self._client.client_nonce,self.base) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3298 |
|
4524
68bbefb72825
Allow HTMLRequest.batch to filter on other permissions than "View"...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4483
diff
changeset
|
3299 def batch(self, permission='View'): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3300 """ Return a batch object for results from the "current search" |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3301 """ |
|
4328
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
3302 check = self._client.db.security.hasPermission |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
3303 userid = self._client.userid |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
3304 if not check('Web Access', userid): |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
3305 return Batch(self.client, [], self.pagesize, self.startwith, |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
3306 classname=self.classname) |
|
3d224f7fb364
add web access check all over templating
Richard Jones <richard@users.sourceforge.net>
parents:
4306
diff
changeset
|
3307 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3308 filterspec = self.filterspec |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3309 sort = self.sort |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3310 group = self.group |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3311 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3312 # get the list of ids we're batching over |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3313 klass = self.client.db.getclass(self.classname) |
| 1002 | 3314 if self.search_text: |
|
6593
e70e2789bc2c
issue2551189 - increase text search maxlength
John Rouillard <rouilj@ieee.org>
parents:
6588
diff
changeset
|
3315 indexer = self.client.db.indexer |
|
e70e2789bc2c
issue2551189 - increase text search maxlength
John Rouillard <rouilj@ieee.org>
parents:
6588
diff
changeset
|
3316 if indexer.query_language: |
|
6588
91ab3e0ffcd0
Summary: Add test cases for sqlite fts
John Rouillard <rouilj@ieee.org>
parents:
6564
diff
changeset
|
3317 try: |
|
6593
e70e2789bc2c
issue2551189 - increase text search maxlength
John Rouillard <rouilj@ieee.org>
parents:
6588
diff
changeset
|
3318 matches = indexer.search( |
|
6588
91ab3e0ffcd0
Summary: Add test cases for sqlite fts
John Rouillard <rouilj@ieee.org>
parents:
6564
diff
changeset
|
3319 [self.search_text], klass) |
|
91ab3e0ffcd0
Summary: Add test cases for sqlite fts
John Rouillard <rouilj@ieee.org>
parents:
6564
diff
changeset
|
3320 except Exception as e: |
|
91ab3e0ffcd0
Summary: Add test cases for sqlite fts
John Rouillard <rouilj@ieee.org>
parents:
6564
diff
changeset
|
3321 self.client.add_error_message(" ".join(e.args)) |
|
91ab3e0ffcd0
Summary: Add test cases for sqlite fts
John Rouillard <rouilj@ieee.org>
parents:
6564
diff
changeset
|
3322 raise |
|
91ab3e0ffcd0
Summary: Add test cases for sqlite fts
John Rouillard <rouilj@ieee.org>
parents:
6564
diff
changeset
|
3323 else: |
|
6593
e70e2789bc2c
issue2551189 - increase text search maxlength
John Rouillard <rouilj@ieee.org>
parents:
6588
diff
changeset
|
3324 matches = indexer.search( |
|
6588
91ab3e0ffcd0
Summary: Add test cases for sqlite fts
John Rouillard <rouilj@ieee.org>
parents:
6564
diff
changeset
|
3325 [u2s(w.upper()) for w in re.findall( |
|
6593
e70e2789bc2c
issue2551189 - increase text search maxlength
John Rouillard <rouilj@ieee.org>
parents:
6588
diff
changeset
|
3326 r'(?u)\b\w{%s,%s}\b' % (indexer.minlength, |
|
e70e2789bc2c
issue2551189 - increase text search maxlength
John Rouillard <rouilj@ieee.org>
parents:
6588
diff
changeset
|
3327 indexer.maxlength), |
|
6588
91ab3e0ffcd0
Summary: Add test cases for sqlite fts
John Rouillard <rouilj@ieee.org>
parents:
6564
diff
changeset
|
3328 s2u(self.search_text, "replace") |
|
91ab3e0ffcd0
Summary: Add test cases for sqlite fts
John Rouillard <rouilj@ieee.org>
parents:
6564
diff
changeset
|
3329 )], klass) |
| 1002 | 3330 else: |
| 3331 matches = None | |
|
3126
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
3332 |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
3333 # filter for visibility |
|
a2889d22db4a
the cgi templating code now checks item-level
Richard Jones <richard@users.sourceforge.net>
parents:
3117
diff
changeset
|
3334 l = [id for id in klass.filter(matches, filterspec, sort, group) |
|
4524
68bbefb72825
Allow HTMLRequest.batch to filter on other permissions than "View"...
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4483
diff
changeset
|
3335 if check(permission, userid, self.classname, itemid=id)] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3336 |
|
1182
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3337 # return the batch object, using IDs only |
|
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3338 return Batch(self.client, l, self.pagesize, self.startwith, |
|
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3339 classname=self.classname) |
|
1004
5f12d3259f31
logout works better now
Richard Jones <richard@users.sourceforge.net>
parents:
1003
diff
changeset
|
3340 |
|
5f12d3259f31
logout works better now
Richard Jones <richard@users.sourceforge.net>
parents:
1003
diff
changeset
|
3341 # extend the standard ZTUtils Batch object to remove dependency on |
|
5f12d3259f31
logout works better now
Richard Jones <richard@users.sourceforge.net>
parents:
1003
diff
changeset
|
3342 # Acquisition and add a couple of useful methods |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3343 class Batch(ZTUtils.Batch): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3344 """ Use me to turn a list of items, or item ids of a given class, into a |
|
1122
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3345 series of batches. |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3346 |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3347 ========= ======================================================== |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3348 Parameter Usage |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3349 ========= ======================================================== |
|
1182
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3350 sequence a list of HTMLItems or item ids |
|
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3351 classname if sequence is a list of ids, this is the class of item |
|
1122
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3352 size how big to make the sequence. |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3353 start where to start (0-indexed) in the sequence. |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3354 end where to end (0-indexed) in the sequence. |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3355 orphan if the next batch would contain less items than this |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3356 value, then it is combined with this batch |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3357 overlap the number of items shared between adjacent batches |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3358 ========= ======================================================== |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3359 |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3360 Attributes: Note that the "start" attribute, unlike the |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3361 argument, is a 1-based index (I know, lame). "first" is the |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3362 0-based index. "length" is the actual number of elements in |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3363 the batch. |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3364 |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3365 "sequence_length" is the length of the original, unbatched, sequence. |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3366 """ |
|
1122
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3367 def __init__(self, client, sequence, size, start, end=0, orphan=0, |
|
1182
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3368 overlap=0, classname=None): |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3369 self.client = client |
| 1002 | 3370 self.last_index = self.last_item = None |
| 3371 self.current_item = None | |
|
1182
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3372 self.classname = classname |
|
1124
1fc1f92c5f31
more doc, bugfix in Batch
Richard Jones <richard@users.sourceforge.net>
parents:
1123
diff
changeset
|
3373 self.sequence_length = len(sequence) |
|
1122
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3374 ZTUtils.Batch.__init__(self, sequence, size, start, end, orphan, |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3375 overlap) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3376 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3377 # overwrite so we can late-instantiate the HTMLItem instance |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3378 def __getitem__(self, index): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3379 if index < 0: |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
3380 if index + self.end < self.first: raise IndexError(index) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3381 return self._sequence[index + self.end] |
|
2327
36ae1b14aaab
remove excessive spaces in the translatable strings;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2324
diff
changeset
|
3382 |
|
1120
c26471971d18
Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents:
1113
diff
changeset
|
3383 if index >= self.length: |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
3384 raise IndexError(index) |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3385 |
| 1002 | 3386 # move the last_item along - but only if the fetched index changes |
| 3387 # (for some reason, index 0 is fetched twice) | |
| 3388 if index != self.last_index: | |
| 3389 self.last_item = self.current_item | |
| 3390 self.last_index = index | |
| 3391 | |
|
1182
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3392 item = self._sequence[index + self.first] |
|
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3393 if self.classname: |
|
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3394 # map the item ids to instances |
|
2649
1df7d4a41da4
Buncha stuff (sorry about the large checkin):
Richard Jones <richard@users.sourceforge.net>
parents:
2640
diff
changeset
|
3395 item = HTMLItem(self.client, self.classname, item) |
|
1182
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3396 self.current_item = item |
|
cb35cf3db0e0
don't create instances that aren't used
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
3397 return item |
| 1002 | 3398 |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3399 def propchanged(self, *properties): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3400 """ Detect if one of the properties marked as being a group |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3401 property changed in the last iteration fetch |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3402 """ |
|
3369
18f1631c9b85
sort/group by missing values correctly [SF#1198623]
Richard Jones <richard@users.sourceforge.net>
parents:
3363
diff
changeset
|
3403 # we poke directly at the _value here since MissingValue can screw |
|
18f1631c9b85
sort/group by missing values correctly [SF#1198623]
Richard Jones <richard@users.sourceforge.net>
parents:
3363
diff
changeset
|
3404 # us up and cause Nones to compare strangely |
|
3696
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3405 if self.last_item is None: |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3406 return 1 |
|
790363e96852
Sorting/grouping by multiple properties.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3689
diff
changeset
|
3407 for property in properties: |
|
4875
cdec6ed210d0
Fix batch.propchanged for transitive id properties (would result in a
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4864
diff
changeset
|
3408 if property == 'id' or property.endswith ('.id')\ |
|
cdec6ed210d0
Fix batch.propchanged for transitive id properties (would result in a
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4864
diff
changeset
|
3409 or isinstance (self.last_item[property], list): |
|
3700
9cc2566cc7d9
This isn't really nice, but now grouping by transitive multilinks works.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3699
diff
changeset
|
3410 if (str(self.last_item[property]) != |
|
9cc2566cc7d9
This isn't really nice, but now grouping by transitive multilinks works.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3699
diff
changeset
|
3411 str(self.current_item[property])): |
|
3699
976191d749fb
grouping by ID and grouping by transitive multilinks didn't work correctly.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3698
diff
changeset
|
3412 return 1 |
|
976191d749fb
grouping by ID and grouping by transitive multilinks didn't work correctly.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3698
diff
changeset
|
3413 else: |
|
976191d749fb
grouping by ID and grouping by transitive multilinks didn't work correctly.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3698
diff
changeset
|
3414 if (self.last_item[property]._value != |
|
976191d749fb
grouping by ID and grouping by transitive multilinks didn't work correctly.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3698
diff
changeset
|
3415 self.current_item[property]._value): |
|
976191d749fb
grouping by ID and grouping by transitive multilinks didn't work correctly.
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
3698
diff
changeset
|
3416 return 1 |
| 1002 | 3417 return 0 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3418 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3419 # override these 'cos we don't have access to acquisition |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3420 def previous(self): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3421 if self.start == 1: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3422 return None |
|
5087
39af8a0f3446
Applied patch attached to issue2550723. Problem in index page
John Rouillard <rouilj@ieee.org>
parents:
5082
diff
changeset
|
3423 return Batch(self.client, self._sequence, self.size, |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3424 self.first - self._size + self.overlap, 0, self.orphan, |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3425 self.overlap) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3426 |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3427 def next(self): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3428 try: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3429 self._sequence[self.end] |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3430 except IndexError: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3431 return None |
|
5087
39af8a0f3446
Applied patch attached to issue2550723. Problem in index page
John Rouillard <rouilj@ieee.org>
parents:
5082
diff
changeset
|
3432 return Batch(self.client, self._sequence, self.size, |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3433 self.end - self.overlap, 0, self.orphan, self.overlap) |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3434 |
|
1120
c26471971d18
Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents:
1113
diff
changeset
|
3435 class TemplatingUtils: |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3436 """ Utilities for templating |
|
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3437 """ |
|
1120
c26471971d18
Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents:
1113
diff
changeset
|
3438 def __init__(self, client): |
|
c26471971d18
Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents:
1113
diff
changeset
|
3439 self.client = client |
|
1122
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3440 def Batch(self, sequence, size, start, end=0, orphan=0, overlap=0): |
|
ddbc5d1ad94f
more batching cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1120
diff
changeset
|
3441 return Batch(self.client, sequence, size, start, end, orphan, |
|
1120
c26471971d18
Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents:
1113
diff
changeset
|
3442 overlap) |
|
c26471971d18
Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents:
1113
diff
changeset
|
3443 |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
3444 def anti_csrf_nonce(self, lifetime=None): |
|
5488
52cb53eedf77
reworked random number use
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5485
diff
changeset
|
3445 return anti_csrf_nonce(self.client, lifetime=lifetime) |
|
5201
a9ace22e0a2f
issue 2550690 - Adding anti-csrf measures to roundup following
John Rouillard <rouilj@ieee.org>
parents:
5193
diff
changeset
|
3446 |
|
5973
fe334430ca07
issue2550919 - Anti-bot signup using 4 second delay
John Rouillard <rouilj@ieee.org>
parents:
5947
diff
changeset
|
3447 def timestamp(self): |
|
fe334430ca07
issue2550919 - Anti-bot signup using 4 second delay
John Rouillard <rouilj@ieee.org>
parents:
5947
diff
changeset
|
3448 return pack_timestamp() |
|
fe334430ca07
issue2550919 - Anti-bot signup using 4 second delay
John Rouillard <rouilj@ieee.org>
parents:
5947
diff
changeset
|
3449 |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
3450 def url_quote(self, url): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3451 """URL-quote the supplied text.""" |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5399
diff
changeset
|
3452 return urllib_.quote(url) |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
3453 |
|
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
3454 def html_quote(self, html): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3455 """HTML-quote the supplied text.""" |
|
5800
1a835db41674
Call cgi.escape only on python 2. Replace with html.escapeif it can be
John Rouillard <rouilj@ieee.org>
parents:
5684
diff
changeset
|
3456 return html_escape(html) |
|
2180
58b6d1747973
Web interface tweaks.
Richard Jones <richard@users.sourceforge.net>
parents:
2170
diff
changeset
|
3457 |
|
2640
b01eca163779
The "type" parameter is supposed to be optional
Richard Jones <richard@users.sourceforge.net>
parents:
2637
diff
changeset
|
3458 def __getattr__(self, name): |
|
3842
310e315624b1
Change ''' into """ to work around bug in Emacs' syntax highlighting code.
Erik Forsberg <forsberg@users.sourceforge.net>
parents:
3832
diff
changeset
|
3459 """Try the tracker's templating_utils.""" |
|
2640
b01eca163779
The "type" parameter is supposed to be optional
Richard Jones <richard@users.sourceforge.net>
parents:
2637
diff
changeset
|
3460 if not hasattr(self.client.instance, 'templating_utils'): |
|
b01eca163779
The "type" parameter is supposed to be optional
Richard Jones <richard@users.sourceforge.net>
parents:
2637
diff
changeset
|
3461 # backwards-compatibility |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
3462 raise AttributeError(name) |
|
5381
0942fe89e82e
Python 3 preparation: change "x.has_key(y)" to "y in x".
Joseph Myers <jsm@polyomino.org.uk>
parents:
5378
diff
changeset
|
3463 if name not in self.client.instance.templating_utils: |
|
5378
35ea9b1efc14
Python 3 preparation: "raise" syntax.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5356
diff
changeset
|
3464 raise AttributeError(name) |
|
3006
50b0f8e98247
fix API for templating utils extensions - remove "utils" arg
Richard Jones <richard@users.sourceforge.net>
parents:
2994
diff
changeset
|
3465 return self.client.instance.templating_utils[name] |
|
2640
b01eca163779
The "type" parameter is supposed to be optional
Richard Jones <richard@users.sourceforge.net>
parents:
2637
diff
changeset
|
3466 |
|
4466
f1fe6fd0aa61
Multilinks can be filtered by combining elements with AND, OR and NOT now.
Bernhard Reiter <Bernhard.Reiter@intevation.de>
parents:
4463
diff
changeset
|
3467 def keywords_expressions(self, request): |
|
f1fe6fd0aa61
Multilinks can be filtered by combining elements with AND, OR and NOT now.
Bernhard Reiter <Bernhard.Reiter@intevation.de>
parents:
4463
diff
changeset
|
3468 return render_keywords_expression_editor(request) |
|
f1fe6fd0aa61
Multilinks can be filtered by combining elements with AND, OR and NOT now.
Bernhard Reiter <Bernhard.Reiter@intevation.de>
parents:
4463
diff
changeset
|
3469 |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3470 def html_calendar(self, request): |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3471 """Generate a HTML calendar. |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3472 |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3473 `request` the roundup.request object |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3474 - @template : name of the template |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3475 - form : name of the form to store back the date |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3476 - property : name of the property of the form to store |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3477 back the date |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3478 - date : current date |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3479 - display : when browsing, specifies year and month |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3480 |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3481 html will simply be a table. |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3482 """ |
| 4333 | 3483 tz = request.client.db.getUserTimezone() |
|
4331
7327b102920f
Display 'today' in the account user's timezone, thanks David Wolever
Richard Jones <richard@users.sourceforge.net>
parents:
4329
diff
changeset
|
3484 current_date = date.Date(".").local(tz) |
|
7327b102920f
Display 'today' in the account user's timezone, thanks David Wolever
Richard Jones <richard@users.sourceforge.net>
parents:
4329
diff
changeset
|
3485 date_str = request.form.getfirst("date", current_date) |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3486 display = request.form.getfirst("display", date_str) |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3487 template = request.form.getfirst("@template", "calendar") |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3488 form = request.form.getfirst("form") |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3489 property = request.form.getfirst("property") |
|
5191
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3490 curr_date = "" |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3491 try: |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3492 # date_str and display can be set to an invalid value |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3493 # if user submits a value like "d4" and gets an edit error. |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3494 # If either or both invalid just ignore that we can't parse it |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3495 # and assign them to today. |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3496 curr_date = date.Date(date_str) # to highlight |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3497 display = date.Date(display) # to show |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3498 except ValueError: |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3499 # we couldn't parse the date |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3500 # just let the calendar display |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3501 curr_date = current_date |
|
fe52cab8f5b5
issue2550932 - html_calendar produces templating errors for bad date strings
John Rouillard <rouilj@ieee.org>
parents:
5190
diff
changeset
|
3502 display = current_date |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3503 day = display.day |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3504 |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3505 # for navigation |
|
4651
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3506 try: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3507 date_prev_month = display + date.Interval("-1m") |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3508 except ValueError: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3509 date_prev_month = None |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3510 try: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3511 date_next_month = display + date.Interval("+1m") |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3512 except ValueError: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3513 date_next_month = None |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3514 try: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3515 date_prev_year = display + date.Interval("-1y") |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3516 except ValueError: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3517 date_prev_year = None |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3518 try: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3519 date_next_year = display + date.Interval("+1y") |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3520 except ValueError: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3521 date_next_year = None |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3522 |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3523 res = [] |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3524 |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3525 base_link = "%s?@template=%s&property=%s&form=%s&date=%s" % \ |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3526 (request.classname, template, property, form, curr_date) |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3527 |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3528 # navigation |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3529 # month |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3530 res.append('<table class="calendar"><tr><td>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3531 res.append(' <table width="100%" class="calendar_nav"><tr>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3532 link = "&display=%s"%date_prev_month |
|
4651
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3533 if date_prev_month: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3534 res.append(' <td><a href="%s&display=%s"><</a></td>' |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3535 % (base_link, date_prev_month)) |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3536 else: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3537 res.append(' <td></td>') |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3538 res.append(' <td>%s</td>'%calendar.month_name[display.month]) |
|
4651
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3539 if date_next_month: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3540 res.append(' <td><a href="%s&display=%s">></a></td>' |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3541 % (base_link, date_next_month)) |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3542 else: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3543 res.append(' <td></td>') |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3544 # spacer |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3545 res.append(' <td width="100%"></td>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3546 # year |
|
4651
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3547 if date_prev_year: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3548 res.append(' <td><a href="%s&display=%s"><</a></td>' |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3549 % (base_link, date_prev_year)) |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3550 else: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3551 res.append(' <td></td>') |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3552 res.append(' <td>%s</td>'%display.year) |
|
4651
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3553 if date_next_year: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3554 res.append(' <td><a href="%s&display=%s">></a></td>' |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3555 % (base_link, date_next_year)) |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3556 else: |
|
beb8d43f4d9d
issue2550765: Don't show links in calendar that will fail. Found and fixed by Cédric Krier.
Bernhard Reiter <bernhard@intevation.de>
parents:
4647
diff
changeset
|
3557 res.append(' <td></td>') |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3558 res.append(' </tr></table>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3559 res.append(' </td></tr>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3560 |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3561 # the calendar |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3562 res.append(' <tr><td><table class="calendar_display">') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3563 res.append(' <tr class="weekdays">') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3564 for day in calendar.weekheader(3).split(): |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3565 res.append(' <td>%s</td>'%day) |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3566 res.append(' </tr>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3567 for week in calendar.monthcalendar(display.year, display.month): |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3568 res.append(' <tr>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3569 for day in week: |
|
5180
f95650727b1c
got the indent wrong in the last change for templating.py
John Rouillard <rouilj@ieee.org>
parents:
5179
diff
changeset
|
3570 link = "javascript:form[field].value = '%d-%02d-%02d'; " \ |
|
f95650727b1c
got the indent wrong in the last change for templating.py
John Rouillard <rouilj@ieee.org>
parents:
5179
diff
changeset
|
3571 "if ('createEvent' in document) { var evt = document.createEvent('HTMLEvents'); evt.initEvent('change', true, true); form[field].dispatchEvent(evt); } else { form[field].fireEvent('onchange'); }" \ |
|
f95650727b1c
got the indent wrong in the last change for templating.py
John Rouillard <rouilj@ieee.org>
parents:
5179
diff
changeset
|
3572 "window.close ();"%(display.year, display.month, day) |
|
3292
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3573 if (day == curr_date.day and display.month == curr_date.month |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3574 and display.year == curr_date.year): |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3575 # highlight |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3576 style = "today" |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3577 else : |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3578 style = "" |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3579 if day: |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3580 res.append(' <td class="%s"><a href="%s">%s</a></td>'%( |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3581 style, link, day)) |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3582 else : |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3583 res.append(' <td></td>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3584 res.append(' </tr>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3585 res.append('</table></td></tr></table>') |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3586 return "\n".join(res) |
|
8c7b522dc934
added date selection popup windows (thanks Marcus Priesch)
Richard Jones <richard@users.sourceforge.net>
parents:
3280
diff
changeset
|
3587 |
|
4878
f6e76a03b502
HTML* classes for cgi are now all new-style
Ralf Schlatterbeck <rsc@runtux.com>
parents:
4875
diff
changeset
|
3588 class MissingValue(object): |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3589 def __init__(self, description, **kwargs): |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3590 self.__description = description |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3591 for key, value in kwargs.items(): |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3592 self.__dict__[key] = value |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3593 |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3594 def __call__(self, *args, **kwargs): return MissingValue(self.__description) |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3595 def __getattr__(self, name): |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3596 # This allows assignments which assume all intermediate steps are Null |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3597 # objects if they don't exist yet. |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3598 # |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3599 # For example (with just 'client' defined): |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3600 # |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3601 # client.db.config.TRACKER_WEB = 'BASE/' |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3602 self.__dict__[name] = MissingValue(self.__description) |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3603 return getattr(self, name) |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3604 |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3605 def __getitem__(self, key): return self |
|
5457
a35d4cc8cd1a
fix MissingValue / MockNull to return False on __bool__ and add a
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5448
diff
changeset
|
3606 def __bool__(self): return False |
|
5404
3757449e00c4
Python 3 preparation: use __bool__ instead of __nonzero__.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5402
diff
changeset
|
3607 # Python 2 compatibility: |
|
3757449e00c4
Python 3 preparation: use __bool__ instead of __nonzero__.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5402
diff
changeset
|
3608 __nonzero__ = __bool__ |
|
5457
a35d4cc8cd1a
fix MissingValue / MockNull to return False on __bool__ and add a
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5448
diff
changeset
|
3609 def __contains__(self, key): return False |
|
5461
ad8031290639
Python 3 compatibility for missing / mock value
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5457
diff
changeset
|
3610 def __eq__(self, rhs): return False |
|
ad8031290639
Python 3 compatibility for missing / mock value
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5457
diff
changeset
|
3611 def __ne__(self, rhs): return False |
|
3164
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3612 def __str__(self): return '[%s]'%self.__description |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3613 def __repr__(self): return '<MissingValue 0x%x "%s">'%(id(self), |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3614 self.__description) |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3615 def gettext(self, str): return str |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3616 _ = gettext |
|
24476db8872f
nicer error looking up values of None (response to [SF#1108697])
Richard Jones <richard@users.sourceforge.net>
parents:
3159
diff
changeset
|
3617 |
|
2561
0dd3dca6bd01
always use translation service set in the tracker client instance;
Alexander Smishlajev <a1s@users.sourceforge.net>
parents:
2558
diff
changeset
|
3618 # vim: set et sts=4 sw=4 : |