[Python-checkins] r56594 - in tracker/instances/python-dev: html/file.item.html schema.py

[erik.forsberg]

Author: erik.forsberg
Date: Fri Jul 27 22:47:35 2007
New Revision: 56594

Modified:
   tracker/instances/python-dev/html/file.item.html
   tracker/instances/python-dev/schema.py
Log:
Merged down svn+ssh://svn.python.org/tracker/instances/python-dev-spambayes-integration r56593

Modified: tracker/instances/python-dev/html/file.item.html
==============================================================================
--- tracker/instances/python-dev/html/file.item.html	(original)
+++ tracker/instances/python-dev/html/file.item.html	Fri Jul 27 22:47:35 2007
@@ -70,7 +70,7 @@
      <form method="POST" onSubmit="return submit_once()"
        enctype="multipart/form-data"
        tal:attributes="action context/designator"
-       tal:condition="python:utils.sb_may_classify(context)">
+       tal:condition="python:request.user.hasPermission('SB: May Classify')">
  
       <input type="hidden" name="@action" value="spambayes_classify">
       <input type="submit" name="trainspam" value="Mark as SPAM" i18n:attributes="value">

Modified: tracker/instances/python-dev/schema.py
==============================================================================
--- tracker/instances/python-dev/schema.py	(original)
+++ tracker/instances/python-dev/schema.py	Fri Jul 27 22:47:35 2007
@@ -134,8 +134,8 @@
 db.security.addRole(name='Developer', description='A developer')
 db.security.addRole(name='Coordinator', description='A coordinator')
 
-sb_may_classify  = db.security.addPermission(name="SB: May Classify")
-sb_may_report_misclassified = db.security.addPermission(name="SB: May Report Misclassified")
+db.security.addPermission(name="SB: May Classify")
+db.security.addPermission(name="SB: May Report Misclassified")
 
 #
 # REGULAR USERS