Commit: 29e0b4b3a2d700af1b646892393bac0f5c5847f6 - allura (git)

allura

Commit MetaInfo

• Revision: 29e0b4b3a2d700af1b646892393bac0f5c5847f6 (tree)
• Time: 2012-07-13 19:25:53
• Author: Igor Bondarenko <jetmind2@gmai...>
• Commiter: Igor Bondarenko

Log Message

[#4534] ticket:114 Save changes to neighborhood settings in audit trail

Change Summary

• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/tests/functional/test_neighborhood.py

Incremental Difference

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -477,22 +477,48 @@ class NeighborhoodAdminController(object):
     @require_post()
     @validate(W.neighborhood_overview_form, error_handler=overview)
     def update(self, name=None, css=None, homepage=None, project_template=None, icon=None, **kw):
-        self.neighborhood.name = name
-        self.neighborhood.redirect = kw.pop('redirect', '')
-        self.neighborhood.homepage = homepage
-        self.neighborhood.css = css
-        self.neighborhood.project_template = project_template
-        self.neighborhood.allow_browse = kw.get('allow_browse', False)
-        self.neighborhood.show_title = kw.get('show_title', False)
-        self.neighborhood.project_list_url = kw.get('project_list_url', '')
+        nbhd = self.neighborhood
+        c.project = nbhd.neighborhood_project
+        if nbhd.name != name:
+            M.AuditLog.log('change neighborhood name to %s', name)
+            nbhd.name = name
+        nbhd_redirect = kw.pop('redirect', '')
+        if nbhd.redirect != nbhd_redirect:
+            M.AuditLog.log('change neighborhood redirect to %s', nbhd_redirect)
+            nbhd.redirect = nbhd_redirect
+        if nbhd.homepage != homepage:
+            M.AuditLog.log('change neighborhood homepage to %s', homepage)
+            nbhd.homepage = homepage
+        if nbhd.css != css:
+            M.AuditLog.log('change neighborhood css to %s', css)
+            nbhd.css = css
+        if nbhd.project_template != project_template:
+            M.AuditLog.log('change neighborhood project template to %s',
+                            project_template)
+            nbhd.project_template = project_template
+        allow_browse = kw.get('allow_browse', False)
+        if nbhd.allow_browse != allow_browse:
+            M.AuditLog.log('change neighborhood allow browse to %s',
+                            allow_browse)
+            nbhd.allow_browse = allow_browse
+        show_title = kw.get('show_title', False)
+        if nbhd.show_title != show_title:
+            M.AuditLog.log('change neighborhood show title to %s',
+                            show_title)
+            nbhd.show_title = show_title
+        project_list_url = kw.get('project_list_url', '')
+        if nbhd.project_list_url != project_list_url:
+            M.AuditLog.log('change neighborhood project list url to %s',
+                            project_list_url)
+            nbhd.project_list_url = project_list_url
         tracking_id = kw.get('tracking_id', '')
-        if tracking_id != self.neighborhood.tracking_id:
-            c.project = self.neighborhood.neighborhood_project
+        if tracking_id != nbhd.tracking_id:
             M.AuditLog.log('update neighborhood tracking_id')
-            self.neighborhood.tracking_id = tracking_id
+            nbhd.tracking_id = tracking_id
         if icon is not None and icon != '':
             if self.neighborhood.icon:
                 self.neighborhood.icon.delete()
+            M.AuditLog.log('update neighborhood icon')
             M.NeighborhoodFile.save_image(
                 icon.filename, icon.file, content_type=icon.type,
                 square=True, thumbnail_size=(48, 48),

--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -63,6 +63,44 @@ class TestNeighborhood(TestController):
                           extra_environ=dict(username='root'))
         assert 'Invalid JSON' in r
 
+    def test_admin_overview_audit_log(self):
+
+        def check_log(message):
+            return M.AuditLog.query.find({'message': message}).count() == 1
+
+        nbhd = M.Neighborhood.query.get(name='Projects')
+        nbhd.features['css'] = 'custom'
+        nbhd.features['google_analytics'] = True
+        params = {
+            'name': 'Pjs',
+            'redirect': 'http://fake.org/',
+            'show_title': 'false',
+            'allow_browse': 'false',
+            'css': '.class { border: 1px; }',
+            'tracking_id': 'U-123456',
+            'homepage': '[Homepage]',
+            'project_list_url': 'http://fake.org/project_list',
+            'project_template': '{"name": "template"}'
+
+        }
+        self.app.post('/p/_admin/update', params=params,
+                      extra_environ=dict(username='root'))
+        # must get as many log records as many values are updated
+        assert M.AuditLog.query.find().count() == len(params)
+
+        assert check_log('change neighborhood name to Pjs')
+        assert check_log('change neighborhood redirect to http://fake.org/')
+        assert check_log('change neighborhood show title to False')
+        assert check_log('change neighborhood allow browse to False')
+        assert check_log('change neighborhood css to .class { border: 1px; }')
+        assert check_log('change neighborhood homepage to [Homepage]')
+        assert check_log('change neighborhood project list url to '
+                         'http://fake.org/project_list')
+
+        assert check_log('change neighborhood project template to '
+                         '{"name": "template"}')
+        assert check_log('update neighborhood tracking_id')
+
     def test_show_title(self):
         r = self.app.get('/adobe/_admin/overview', extra_environ=dict(username='root'))
         neighborhood = M.Neighborhood.query.get(name='Adobe')