From 9b2ac4d8b08de8a8e7ff1f2d2b67482780acfd13 Mon Sep 17 00:00:00 2001 From: nsyed22 Date: Tue, 25 Apr 2023 11:16:50 -0400 Subject: [PATCH 1/3] refactor --- pybossa/view/account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pybossa/view/account.py b/pybossa/view/account.py index df4d036df..5cc9e3cde 100644 --- a/pybossa/view/account.py +++ b/pybossa/view/account.py @@ -1182,12 +1182,12 @@ def _add_bookmark(user_name, short_name, bookmark_name, bookmark_url): else: created_date = make_timestamp() updated_date = make_timestamp() - bookmark_payload = { + bookmark_data = { 'url': bookmark_url, 'created': created_date, 'updated': updated_date } - proj_bookmarks[bookmark_name] = bookmark_payload + proj_bookmarks[bookmark_name] = bookmark_data taskbrowse_bookmarks[short_name] = proj_bookmarks user.info['taskbrowse_bookmarks'] = taskbrowse_bookmarks From c4fcfa958e0dd9af7dc3470385114b66d0f7356a Mon Sep 17 00:00:00 2001 From: nsyed22 Date: Wed, 26 Apr 2023 10:54:56 -0400 Subject: [PATCH 2/3] remove make_timestamp --- pybossa/view/account.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pybossa/view/account.py b/pybossa/view/account.py index 5cc9e3cde..89a6eb171 100644 --- a/pybossa/view/account.py +++ b/pybossa/view/account.py @@ -58,6 +58,7 @@ from pybossa.core import user_repo, ldap from pybossa.feed import get_update_feed from pybossa.messages import * +from pybossa.model import make_timestamp from pybossa.forms.forms import UserPrefMetadataForm, RegisterFormWithUserPrefMetadata from pybossa.forms.account_view_forms import * @@ -1155,11 +1156,6 @@ def add_metadata(name): return redirect(url_for('account.profile', name=name)) -def make_timestamp(): - now = datetime.now() - return now.isoformat() - - def _get_bookmarks(user_name, short_name): taskbrowse_bookmarks = cached_users.get_taskbrowse_bookmarks(user_name) proj_bookmarks = taskbrowse_bookmarks.get(short_name, {}) From 20943b0a9ab15aa3d6c99f7ad624373f9315871c Mon Sep 17 00:00:00 2001 From: nsyed22 Date: Wed, 26 Apr 2023 10:56:23 -0400 Subject: [PATCH 3/3] remove make_timestamp --- pybossa/view/account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pybossa/view/account.py b/pybossa/view/account.py index 89a6eb171..8795f929b 100644 --- a/pybossa/view/account.py +++ b/pybossa/view/account.py @@ -1176,8 +1176,8 @@ def _add_bookmark(user_name, short_name, bookmark_name, bookmark_url): if old_bookmark is not None: created_date = old_bookmark['created'] else: - created_date = make_timestamp() - updated_date = make_timestamp() + created_date = model.make_timestamp() + updated_date = model.make_timestamp() bookmark_data = { 'url': bookmark_url, 'created': created_date,