From 1c1dd83603b0ed6d5ad1ff735ab179167c80358f Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Fri, 11 Jan 2019 15:19:56 -0800 Subject: start fixing webface for editgroup changes --- python/fatcat_web/routes.py | 8 ++++---- python/fatcat_web/templates/editor_editgroups.html | 14 ++++++-------- python/tests/routes.py | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py index 4a70eef1..701cf08b 100644 --- a/python/fatcat_web/routes.py +++ b/python/fatcat_web/routes.py @@ -313,15 +313,15 @@ def editor_view(ident): abort(ae.status) return render_template('editor_view.html', editor=entity) -@app.route('/editor//changelog', methods=['GET']) +@app.route('/editor//editgroups', methods=['GET']) def editor_changelog(ident): try: editor = api.get_editor(ident) - changelog_entries = api.get_editor_changelog(ident) + editgroups = api.get_editor_editgroups(ident, limit=50) except ApiException as ae: abort(ae.status) - return render_template('editor_changelog.html', editor=editor, - changelog_entries=changelog_entries) + return render_template('editor_editgroups.html', editor=editor, + editgroups=editgroups) # Not implemented #@app.route('/editor//wip', methods=['GET']) diff --git a/python/fatcat_web/templates/editor_editgroups.html b/python/fatcat_web/templates/editor_editgroups.html index 785c19bd..cb9b2f56 100644 --- a/python/fatcat_web/templates/editor_editgroups.html +++ b/python/fatcat_web/templates/editor_editgroups.html @@ -11,18 +11,16 @@

Changes accepted (aka, merged editgroups): - - {% for entry in changelog_entries %} -
Changelog
Index -
Timestamp (UTC) +
Created (UTC) Editgroup Editor Description
{{ entry.index }} - {{ entry.timestamp }} - {{ entry.editgroup_id }} - {{ entry.editgroup.editor_id }} - {% if entry.editgroup.description != None %}{{ entry.editgroup.description }}{% endif %} + {% for editgroup in editgroups %} +
{{ editgroup.created }} + {{ editgroup.editgroup_id }} + {{ editgroup.editor_id }} + {% if editgroup.description != None %}{{ editgroup.description }}{% endif %} {% endfor %}
diff --git a/python/tests/routes.py b/python/tests/routes.py index bca7cc0f..9a0b7d40 100644 --- a/python/tests/routes.py +++ b/python/tests/routes.py @@ -112,5 +112,5 @@ def test_all_views(app): rv = app.get('/editor/aaaaaaaaaaaabkvkaaaaaaaaae') assert rv.status_code == 200 - rv = app.get('/editor/aaaaaaaaaaaabkvkaaaaaaaaae/changelog') + rv = app.get('/editor/aaaaaaaaaaaabkvkaaaaaaaaae/editgroups') assert rv.status_code == 200 -- cgit v1.2.3