From 9a61903d28dd38bbbce2b66a61224d8f52ff613c Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Tue, 3 Dec 2013 16:48:44 -0500
Subject: [PATCH] Fix date time parameter on log_action to properly use the
 current time (for reals)

---
 data/model.py     |   8 ++++----
 initdb.py         |  18 +++++++++---------
 test/data/test.db | Bin 101376 -> 339968 bytes
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/data/model.py b/data/model.py
index 50ef5892e..f95fe5a2a 100644
--- a/data/model.py
+++ b/data/model.py
@@ -1067,12 +1067,12 @@ def list_logs(user_or_organization_name, repository = None):
     return joined.where(User.username == user_or_organization_name, LogEntry.datetime >= week_ago).order_by(LogEntry.datetime.desc())
 
 def log_action(kind_name, user_or_organization_name, performer=None, repository=None,
-               access_token=None, ip=None, metadata={}, datetime=None):
-  if not datetime:
-    datetime = datetime.today()
+               access_token=None, ip=None, metadata={}, timestamp=None):
+  if not timestamp:
+    timestamp = datetime.today()
 
   kind = LogEntryKind.get(LogEntryKind.name == kind_name)
   account = User.get(User.username == user_or_organization_name)
   entry = LogEntry.create(kind=kind, account=account, performer=performer,
                           repository=repository, access_token=access_token, ip=ip,
-                          metadata_json=json.dumps(metadata), datetime=datetime)
+                          metadata_json=json.dumps(metadata), datetime=timestamp)
diff --git a/initdb.py b/initdb.py
index f1c3c5788..5dc75e52f 100644
--- a/initdb.py
+++ b/initdb.py
@@ -252,31 +252,31 @@ def populate_database():
   six_ago = today - timedelta(5)
   four_ago = today - timedelta(4)
   
-  model.log_action('org_create_team', org.username, performer=new_user_1, datetime=week_ago,
+  model.log_action('org_create_team', org.username, performer=new_user_1, timestamp=week_ago,
                    metadata={'team': 'readers'})
 
-  model.log_action('org_set_team_role', org.username, performer=new_user_1, datetime=week_ago,
+  model.log_action('org_set_team_role', org.username, performer=new_user_1, timestamp=week_ago,
                    metadata={'team': 'readers', 'role': 'read'})
 
-  model.log_action('create_repo', org.username, performer=new_user_1, repository=org_repo, datetime=week_ago,
+  model.log_action('create_repo', org.username, performer=new_user_1, repository=org_repo, timestamp=week_ago,
                    metadata={'namespace': org.username, 'repo': 'orgrepo'})
 
-  model.log_action('change_repo_permission', org.username, performer=new_user_2, repository=org_repo, datetime=six_ago,
+  model.log_action('change_repo_permission', org.username, performer=new_user_2, repository=org_repo, timestamp=six_ago,
                    metadata={'username': new_user_1.username, 'repo': 'orgrepo', 'role': 'admin'})
 
-  model.log_action('change_repo_permission', org.username, performer=new_user_1, repository=org_repo, datetime=six_ago,
+  model.log_action('change_repo_permission', org.username, performer=new_user_1, repository=org_repo, timestamp=six_ago,
                    metadata={'username': new_user_2.username, 'repo': 'orgrepo', 'role': 'read'})
 
-  model.log_action('add_repo_accesstoken', org.username, performer=new_user_1, repository=org_repo, datetime=four_ago,
+  model.log_action('add_repo_accesstoken', org.username, performer=new_user_1, repository=org_repo, timestamp=four_ago,
                    metadata={'repo': 'orgrepo', 'token': 'deploytoken'})
 
-  model.log_action('push_repo', org.username, performer=new_user_2, repository=org_repo, datetime=today,
+  model.log_action('push_repo', org.username, performer=new_user_2, repository=org_repo, timestamp=today,
                    metadata={'username': new_user_2.username, 'repo': 'orgrepo'})
 
-  model.log_action('pull_repo', org.username, performer=new_user_2, repository=org_repo, datetime=today,
+  model.log_action('pull_repo', org.username, performer=new_user_2, repository=org_repo, timestamp=today,
                    metadata={'username': new_user_2.username, 'repo': 'orgrepo'})
 
-  model.log_action('pull_repo', org.username, repository=org_repo, datetime=today,
+  model.log_action('pull_repo', org.username, repository=org_repo, timestamp=today,
                    metadata={'token': 'sometoken', 'token_code': 'somecode', 'repo': 'orgrepo'})
 
 if __name__ == '__main__':
diff --git a/test/data/test.db b/test/data/test.db
index fdb9329a01d83bc1012a996d0e100dbe7a96a2a9..c2ef5d6528ab19aa099da05eaf5e87dfae0471c3 100644
GIT binary patch
delta 12965
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

delta 6280
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
TqDx1~_ldwT`Ji|!RL=f8HxSF;