Skip to content

Commit 78e0a92

Browse files
committed
Remove phone property from schema.
This makes the phone property inaccessible. We don't need or use the phone. See https://issues.roundup-tracker.org/issue2551082.
1 parent a15342f commit 78e0a92

File tree

5 files changed

+3
-20
lines changed

5 files changed

+3
-20
lines changed

website/issues/html/user.help-search.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@
4545
<td metal:use-macro="search_input"><input type=text></td>
4646
</tr>
4747

48-
<tr tal:define="name string:phone; label string:Phone number">
49-
<th metal:use-macro="th_label">Phone</th>
50-
<td metal:use-macro="search_input"><input type=text></td>
51-
</tr>
52-
5348
<tr tal:define="name string:roles;
5449
onchange string:this.form.submit();
5550
label string:Roles:"
@@ -68,7 +63,7 @@
6863
<input type="hidden" name="@action" value="search">
6964
<input type="submit" value="Search" i18n:attributes="value">
7065
<input type="reset">
71-
<input type="hidden" value="username,realname,phone,organisation,roles" name="properties">
66+
<input type="hidden" value="username,realname,organisation,roles" name="properties">
7267
<input type="text" name="@pagesize" id="sp-pagesize" value="25" size="2">
7368
<label for="sp-pagesize" i18n:translate="">Pagesize</label>
7469
</td>

website/issues/html/user.index.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<th i18n:translate="">Real name</th>
5050
<th i18n:translate="">Organisation</th>
5151
<th i18n:translate="">Email address</th>
52-
<th i18n:translate="">Phone number</th>
5352
<th tal:condition="context/is_edit_ok" i18n:translate="">Retire</th>
5453
</tr>
5554
<tal:block repeat="user batch">
@@ -61,7 +60,6 @@
6160
<td tal:content="python:user.realname.plain() or default">&nbsp;</td>
6261
<td tal:content="python:user.organisation.plain() or default">&nbsp;</td>
6362
<td tal:content="python:user.address.email() or default">&nbsp;</td>
64-
<td tal:content="python:user.phone.plain() or default">&nbsp;</td>
6563
<td tal:condition="context/is_edit_ok">
6664
<form style="padding:0" method="POST"
6765
tal:attributes="action string:user${user/id}">

website/issues/html/user.item.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@
8989
</tr>
9090
</tal:if>
9191

92-
<tr tal:define="name string:phone; label string:Phone; value context/phone">
93-
<th metal:use-macro="th_label">Phone</th>
94-
<td><input name="phone" metal:use-macro="normal_input"></td>
95-
</tr>
96-
9792
<tr tal:define="name string:organisation; label string:Organisation; value context/organisation">
9893
<th metal:use-macro="th_label">Organisation</th>
9994
<td><input name="organisation" metal:use-macro="normal_input"></td>

website/issues/html/user.register.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
<input name="roles" tal:attributes="value db/config/NEW_WEB_USER_ROLES">
4545
</td>
4646
</tr>
47-
<tr tal:condition="python:False">
48-
<th i18n:translate="">Phone</th>
49-
<td tal:content="structure context/phone/field">phone</td>
50-
</tr>
5147
<tr tal:condition="python:False">
5248
<th i18n:translate="">Organisation</th>
5349
<td tal:content="structure context/organisation/field">organisation</td>

website/issues/schema.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
password=Password(),
8181
address=String(),
8282
realname=String(),
83-
phone=String(),
8483
organisation=String(),
8584
alternate_addresses=String(),
8685
queries=Multilink('query'),
@@ -261,7 +260,7 @@ def may_edit_file(db, userid, itemid):
261260

262261
# Allow Users and Developers to view most user properties.
263262
p = db.security.addPermission(name='View', klass='user',
264-
properties=('id', 'username', 'address', 'realname', 'phone',
263+
properties=('id', 'username', 'address', 'realname',
265264
'organisation', 'alternate_addresses', 'timezone'))
266265
db.security.addPermissionToRole('User', p)
267266
db.security.addPermissionToRole('Developer', p)
@@ -289,7 +288,7 @@ def own_record(db, userid, itemid):
289288
description="User is allowed to edit their own user details",
290289
properties=('username', 'password',
291290
'address', 'realname',
292-
'phone', 'organisation',
291+
'organisation',
293292
'alternate_addresses',
294293
'queries',
295294
'timezone')) # Note: 'roles' excluded - users should not be able to edit their own roles.

0 commit comments

Comments
 (0)