From 72b11691cb2c4b832ef80619862b70c09f1c6722 Mon Sep 17 00:00:00 2001 From: smit thakkar Date: Feb 19 2017 04:11:16 +0000 Subject: [PATCH 1/2] Merge branch 'master' of ssh://pagure.io/pagure --- diff --git a/pagure/forms.py b/pagure/forms.py index 1e88704..f175f8f 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -99,6 +99,7 @@ def file_virus_validator(form, field): def ssh_key_validator(form, field): + ''' Form for ssh key validation ''' if not pagure.lib.are_valid_ssh_keys(field.data): raise wtforms.ValidationError('Invalid SSH keys') From e41177118d4c394b717880f870af2f6feb404379 Mon Sep 17 00:00:00 2001 From: smit thakkar Date: Feb 19 2017 07:01:26 +0000 Subject: [PATCH 2/2] Changed log_action to record the datetime when action was performed. Fix issue: #1949 --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 9211850..84ea5c9 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -3830,7 +3830,6 @@ def get_user_activity_day(session, user, date): def log_action(session, action, obj, user_obj): ''' Log an user action on a project/issue/PR. ''' - project_id = None if obj.isa in ['issue', 'pull-request']: project_id = obj.project_id @@ -3845,9 +3844,9 @@ def log_action(session, action, obj, user_obj): user_id=user_obj.id, project_id=project_id, log_type=action, - ref_id=obj.id, - date=obj.date_created.date(), - date_created=obj.date_created + ref_id=obj.id + # date=obj.date_created.date(), + # date_created=obj.date_created ) if obj.isa == 'issue': setattr(log, 'issue_uid', obj.uid)