提交: 8987f9b88c7e733db5306e5b8a4407c719919fe2 - allura (git)

allura

Commit MetaInfo

• 修訂: 8987f9b88c7e733db5306e5b8a4407c719919fe2 (tree)
• 時間: 2012-05-04 02:21:02
• 作者: Cory Johns <johnsca@geek...>
• Commiter: Yaroslav Luzin

Log Message

[#3970] Changed to use nhbd project for audit log when noting change of nhbd tracking ID

Signed-off-by: Cory Johns <[e-mail]>

Change Summary

• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/model/auth.py

差異

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -467,6 +467,7 @@ class NeighborhoodAdminController(object):
         self.neighborhood.allow_browse = kw.get('allow_browse', False)
         tracking_id = kw.get('tracking_id', '')
         if tracking_id != self.neighborhood.tracking_id:
+            c.project = self.neighborhood.neighborhood_project
             M.AuditLog.log('update neighborhood tracking_id')
             self.neighborhood.tracking_id = tracking_id
         if icon is not None and icon != '':

--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -622,10 +622,7 @@ class AuditLog(object):
             message = message % args
         elif kwargs:
             message = message % kwargs
-        if project:
-            return cls(project_id=project._id, user_id=user._id, url=url, message=message)
-        else:
-            return cls(user_id=user._id, url=url, message=message)
+        return cls(project_id=project._id, user_id=user._id, url=url, message=message)
 
 main_orm_session.mapper(AuditLog, audit_log, properties=dict(
         project_id=ForeignIdProperty('Project'),