Skip to content

Commit fe6fc5f

Browse files
author
Richard Jones
committed
merge from HEAD
1 parent 625bd8c commit fe6fc5f

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Fixed:
99
- handle postgresql bug in SQL generation (sf bug 984591)
1010
- fix dates-from-Dates (sf bug 984604)
1111
- fix messageid generated when msgid is None for send_message (sf bug 987933)
12+
- make user permissions check more sane (fix search page for anonymous)
1213

1314

1415
2004-06-24 0.7.5

roundup/cgi/templating.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -950,6 +950,7 @@ def _user_perm_check(self, type):
950950
# may anonymous users register? (so, they need to be anonymous,
951951
# need the Web Rego permission, and not trying to view an item)
952952
rego = s.hasPermission('Web Registration', userid, self._classname)
953+
rego = rego and self._client.template == 'register'
953954
if is_anonymous and rego and getattr(self, '_nodeid', None) is None:
954955
return 1
955956

templates/classic/html/issue.search.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@
6969

7070
<tr tal:define="name string:creator;
7171
db_klass string:user;
72-
db_content string:username;">
72+
db_content string:username;"
73+
tal:condition="db/user/is_view_ok">
7374
<th>Creator:</th>
7475
<td metal:use-macro="search_select">
7576
<option metal:fill-slot="extra_options"
@@ -88,7 +89,10 @@
8889
<td>&nbsp;</td>
8990
</tr>
9091

91-
<tr tal:define="name string:actor">
92+
<tr tal:define="name string:actor;
93+
db_klass string:user;
94+
db_content string:username;"
95+
tal:condition="db/user/is_view_ok">
9296
<th>Actor:</th>
9397
<td metal:use-macro="search_select">
9498
<option metal:fill-slot="extra_options"
@@ -131,7 +135,8 @@
131135

132136
<tr tal:define="name string:assignedto;
133137
db_klass string:user;
134-
db_content string:username;">
138+
db_content string:username;"
139+
tal:condition="db/user/is_view_ok">
135140
<th>Assigned to:</th>
136141
<td metal:use-macro="search_select">
137142
<tal:block metal:fill-slot="extra_options">

0 commit comments

Comments
 (0)