コミット: 97e006e69f52318307e88ebaa66a2d4b9c772b07 - allura (git)

allura

コミットメタ情報

• リビジョン: 97e006e69f52318307e88ebaa66a2d4b9c772b07 (tree)
• 日時: 2012-06-06 21:04:56
• 作者: bolkimen <bolkimen@yaho...>
• コミッター: bolkimen

ログメッセージ

[#3892] ticket:76 write = create + update

変更サマリ

• modified: ForgeTracker/forgetracker/templates/tracker/ticket.html
• modified: ForgeTracker/forgetracker/tests/functional/test_root.py
• modified: ForgeTracker/forgetracker/tests/test_tracker_roles.py
• modified: ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
• modified: ForgeTracker/forgetracker/tracker_main.py

差分

--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -143,7 +143,7 @@
 {% endblock %}
 
 {% block extra_js %}
-  {% if h.has_access(ticket, 'write')() %}
+  {% if h.has_access(ticket, 'update')() %}
     <script type="text/javascript">
         $(document).ready(function () {
           // show/hide form

--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -173,7 +173,7 @@ class TestFunctionalController(TrackerTestController):
         index_view = self.app.get('/bugs/')
         assert 'No open tickets found.' in index_view
         assert 'Create Ticket' in index_view
-        # No 'Create Ticket' button for user without 'write' perm
+        # No 'Create Ticket' button for user without 'create' perm
         r = self.app.get('/bugs/', extra_environ=dict(username='*anonymous'))
         assert 'Create Ticket' not in r
 
@@ -879,7 +879,8 @@ class TestMilestoneAdmin(TrackerTestController):
 def post_install_hook(app):
     role_anon = M.ProjectRole.by_name('*anonymous')._id
     app.config.acl.append(M.ACE.allow(role_anon, 'post'))
-    app.config.acl.append(M.ACE.allow(role_anon, 'write'))
+    app.config.acl.append(M.ACE.allow(role_anon, 'create'))
+    app.config.acl.append(M.ACE.allow(role_anon, 'update'))
 
 class TestEmailMonitoring(TrackerTestController):
     def __init__(self):

--- a/ForgeTracker/forgetracker/tests/test_tracker_roles.py
+++ b/ForgeTracker/forgetracker/tests/test_tracker_roles.py
@@ -23,7 +23,8 @@ def test_role_assignments():
         return pred(user=admin), pred(user=user), pred(user=anon)
     assert check_access('configure') == (True, False, False)
     assert check_access('read') == (True, True, True)
-    assert check_access('write') == (True, False, False)
+    assert check_access('update') == (True, False, False)
+    assert check_access('create') == (True, False, False)
     assert check_access('unmoderated_post') == (True, True, False)
     assert check_access('post') == (True, True, False)
     assert check_access('moderate') == (True, False, False)

--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
@@ -80,24 +80,32 @@ class TestTicketModel(TrackerTestWithModel):
                          ACE.allow(role_creator, ALL_PERMISSIONS),
                          DENY_ALL]
         assert has_access(t, 'read', user=admin)()
-        assert has_access(t, 'write', user=admin)()
+        assert has_access(t, 'create', user=admin)()
+        assert has_access(t, 'update', user=admin)()
         assert has_access(t, 'read', user=creator)()
-        assert has_access(t, 'write', user=creator)()
+        assert has_access(t, 'create', user=creator)()
+        assert has_access(t, 'update', user=creator)()
         assert has_access(t, 'read', user=developer)()
-        assert has_access(t, 'write', user=developer)()
+        assert has_access(t, 'create', user=developer)()
+        assert has_access(t, 'update', user=developer)()
         assert not has_access(t, 'read', user=observer)()
-        assert not has_access(t, 'write', user=observer)()
+        assert not has_access(t, 'create', user=observer)()
+        assert not has_access(t, 'update', user=observer)()
         assert not has_access(t, 'read', user=anon)()
-        assert not has_access(t, 'write', user=anon)()
+        assert not has_access(t, 'create', user=anon)()
+        assert not has_access(t, 'update', user=anon)()
 
         t.private = False
         assert t.acl == []
         assert has_access(t, 'read', user=admin)()
-        assert has_access(t, 'write', user=admin)()
+        assert has_access(t, 'create', user=admin)()
+        assert has_access(t, 'update', user=admin)()
         assert has_access(t, 'read', user=developer)()
-        assert has_access(t, 'write', user=developer)()
+        assert has_access(t, 'create', user=developer)()
+        assert has_access(t, 'update', user=developer)()
         assert has_access(t, 'read', user=creator)()
         assert has_access(t, 'unmoderated_post', user=creator)()
-        assert not has_access(t, 'write', user=creator)()
+        assert not has_access(t, 'create', user=creator)()
+        assert not has_access(t, 'update', user=creator)()
         assert has_access(t, 'read', user=observer)()
         assert has_access(t, 'read', user=anon)()

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -100,7 +100,7 @@ class W:
 
 class ForgeTrackerApp(Application):
     __version__ = version.__version__
-    permissions = ['configure', 'read', 'write', 'save_searches',
+    permissions = ['configure', 'read', 'update', 'create', 'save_searches',
                     'unmoderated_post', 'post', 'moderate', 'admin']
     config_options = Application.config_options + [
         ConfigOption('TicketMonitoringEmail', str, ''),
@@ -190,7 +190,7 @@ class ForgeTrackerApp(Application):
             ticket = None
 
         links = []
-        if has_access(self, 'write')():
+        if has_access(self, 'create')():
             links.append(SitemapEntry('Create Ticket',
                 self.config.url() + 'new/', ui_icon=g.icons['plus']))
         if has_access(self, 'configure')():
@@ -260,7 +260,8 @@ class ForgeTrackerApp(Application):
             M.ACE.allow(role_anon, 'read'),
             M.ACE.allow(role_auth, 'post'),
             M.ACE.allow(role_auth, 'unmoderated_post'),
-            M.ACE.allow(role_developer, 'write'),
+            M.ACE.allow(role_developer, 'update'),
+            M.ACE.allow(role_developer, 'create'),
             M.ACE.allow(role_developer, 'moderate'),
             M.ACE.allow(role_developer, 'save_searches'),
             M.ACE.allow(role_admin, 'configure'),
@@ -404,7 +405,7 @@ class RootController(BaseController):
                                         columns=columns, page=page, **kw)
         c.subscribe_form = W.subscribe_form
         result['subscribed'] = M.Mailbox.subscribed()
-        result['allow_edit'] = has_access(c.app, 'write')()
+        result['allow_edit'] = has_access(c.app, 'update')()
         result['help_msg'] = c.app.config.options.get('TicketHelpSearch')
         result['url_q'] = c.app.globals.not_closed_query
         result['url_sort'] = ''
@@ -501,7 +502,7 @@ class RootController(BaseController):
         if project:
             redirect(c.project.url() + 'search?' + urlencode(dict(q=q, history=kw.get('history'))))
         result = self.paged_query(q, page=page, sort=sort, columns=columns, **kw)
-        result['allow_edit'] = has_access(c.app, 'write')()
+        result['allow_edit'] = has_access(c.app, 'update')()
         result['bin'] = bin
         result['help_msg'] = c.app.config.options.get('TicketHelpSearch')
         c.ticket_search_results = W.ticket_search_results
@@ -544,7 +545,7 @@ class RootController(BaseController):
     @with_trailing_slash
     @expose('jinja:forgetracker:templates/tracker/new_ticket.html')
     def new(self, super_id=None, **kw):
-        require_access(c.app, 'write')
+        require_access(c.app, 'create')
         c.ticket_form = W.ticket_form
         help_msg = c.app.config.options.get('TicketHelpNew')
         return dict(action=c.app.config.url()+'save_ticket',
@@ -599,9 +600,9 @@ class RootController(BaseController):
                 ticket_num=ticket_num)
             if not ticket:
                 raise Exception('Ticket number not found.')
-            require_access(ticket, 'write')
+            require_access(ticket, 'update')
         else:
-            require_access(c.app, 'write')
+            require_access(c.app, 'create')
             ticket = TM.Ticket.new()
         ticket.update(ticket_form)
         redirect(str(ticket.ticket_num)+'/')
@@ -613,7 +614,7 @@ class RootController(BaseController):
                    page=validators.Int(if_empty=0),
                    sort=validators.UnicodeString(if_empty='ticket_num_i asc')))
     def edit(self, q=None, limit=None, page=None, sort=None, **kw):
-        require_access(c.app, 'write')
+        require_access(c.app, 'update')
         result = self.paged_query(q, sort=sort, limit=limit, page=page, **kw)
         # if c.app.globals.milestone_names is None:
         #     c.app.globals.milestone_names = ''
@@ -634,7 +635,7 @@ class RootController(BaseController):
                 _id={'$in':[ObjectId(id) for id in post_data['selected'].split(',')]},
                 app_config_id=c.app.config._id)).all()
         for ticket in tickets:
-            require_access(ticket, 'write')
+            require_access(ticket, 'update')
 
         fields = set(['status'])
         values = {}
@@ -1012,7 +1013,7 @@ class TicketController(BaseController):
             post_count = self.ticket.discussion_thread.post_count
             limit, page = h.paging_sanitizer(limit, page, post_count)
             return dict(ticket=self.ticket, globals=c.app.globals,
-                        allow_edit=has_access(self.ticket, 'write')(),
+                        allow_edit=has_access(self.ticket, 'update')(),
                         tool_subscribed=tool_subscribed,
                         subscribed=subscribed,
                         page=page, limit=limit, count=post_count)
@@ -1073,7 +1074,7 @@ class TicketController(BaseController):
 
     @require_post()
     def _update_ticket(self, post_data):
-        require_access(self.ticket, 'write')
+        require_access(self.ticket, 'update')
         changes = changelog()
         comment = post_data.pop('comment', None)
         labels = post_data.pop('labels', None) or []
@@ -1180,7 +1181,7 @@ class TicketController(BaseController):
 
 class AttachmentController(ac.AttachmentController):
     AttachmentClass = TM.TicketAttachment
-    edit_perm = 'write'
+    edit_perm = 'update'
 
 class AttachmentsController(ac.AttachmentsController):
     AttachmentControllerClass = AttachmentController
@@ -1340,7 +1341,7 @@ class RootRestController(BaseController):
     @require_post()
     @validate(W.ticket_form, error_handler=h.json_validation_error)
     def new(self, ticket_form=None, **post_data):
-        require_access(c.app, 'write')
+        require_access(c.app, 'create')
         c.app.globals.invalidate_bin_counts()
         if c.app.globals.milestone_names is None:
             c.app.globals.milestone_names = ''
@@ -1403,7 +1404,7 @@ class TicketRestController(BaseController):
     @require_post()
     @validate(W.ticket_form, error_handler=h.json_validation_error)
     def save(self, ticket_form=None, **post_data):
-        require_access(self.ticket, 'write')
+        require_access(self.ticket, 'update')
         c.app.globals.invalidate_bin_counts()
         # if c.app.globals.milestone_names is None:
         #     c.app.globals.milestone_names = ''
@@ -1439,7 +1440,7 @@ class MilestoneController(BaseController):
         require(has_access(c.app, 'read'))
         result = TM.Ticket.paged_query(
             self.mongo_query, page=page, sort=sort, columns=columns, **kw)
-        result['allow_edit'] = has_access(c.app, 'write')()
+        result['allow_edit'] = has_access(c.app, 'update')()
         result['help_msg'] = c.app.config.options.get('TicketHelpSearch')
         progress = c.app.globals.milestone_count(self.progress_key)
         result.pop('q')
@@ -1465,7 +1466,7 @@ class MilestoneController(BaseController):
                    page=validators.Int(if_empty=0),
                    sort=validators.UnicodeString(if_empty='ticket_num_i asc')))
     def edit(self, q=None, limit=None, page=None, sort=None, columns=None, **kw):
-        require_access(c.app, 'write')
+        require_access(c.app, 'update')
         result = TM.Ticket.paged_query(
             self.mongo_query, page=page, sort=sort, columns=columns, **kw)
         # if c.app.globals.milestone_names is None:
@@ -1486,7 +1487,7 @@ class MilestoneController(BaseController):
                 _id={'$in':[ObjectId(id) for id in post_data['selected'].split(',')]},
                 app_config_id=c.app.config._id)).all()
         for ticket in tickets:
-            require_access(ticket, 'write')
+            require_access(ticket, 'update')
 
         fields = set(['status'])
         values = {}