From 1a371b894a80510241c5804a8fba43a744174716 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 1 Apr 2019 20:48:34 -0700 Subject: allow HTML in flash messages (dangerous) This change means we need to be careful constructing flash messages (not allow user input in them). --- python/fatcat_web/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/fatcat_web/templates/base.html') diff --git a/python/fatcat_web/templates/base.html b/python/fatcat_web/templates/base.html index d3353ca4..fcd7ccdf 100644 --- a/python/fatcat_web/templates/base.html +++ b/python/fatcat_web/templates/base.html @@ -84,7 +84,7 @@
Now Hear This...
-- cgit v1.2.3 From 668076105a975c2898c912c6259aa0189a7662a7 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Wed, 3 Apr 2019 12:10:54 -0700 Subject: reviewable view; improvments to editgroup views --- python/fatcat_web/routes.py | 9 +++++++++ python/fatcat_web/templates/base.html | 4 ++-- python/fatcat_web/templates/changelog.html | 2 +- .../fatcat_web/templates/editgroup_reviewable.html | 23 ++++++++++++++++++++++ python/fatcat_web/templates/editor_editgroups.html | 22 +++++++++++++-------- python/fatcat_web/templates/editor_view.html | 2 +- 6 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 python/fatcat_web/templates/editgroup_reviewable.html (limited to 'python/fatcat_web/templates/base.html') diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py index 57b5d5af..7a148e94 100644 --- a/python/fatcat_web/routes.py +++ b/python/fatcat_web/routes.py @@ -416,6 +416,15 @@ def changelog_entry_view(index): abort(ae.status) return render_template('changelog_view.html', entry=entry, editgroup=entry.editgroup) +@app.route('/reviewable', methods=['GET']) +def reviewable_view(): + try: + #limit = int(request.args.get('limit', 10)) + entries = api.get_editgroups_reviewable() + except ApiException as ae: + abort(ae.status) + return render_template('editgroup_reviewable.html', entries=entries) + ### Search ################################################################## @app.route('/release/search', methods=['GET', 'POST']) diff --git a/python/fatcat_web/templates/base.html b/python/fatcat_web/templates/base.html index fcd7ccdf..37641c90 100644 --- a/python/fatcat_web/templates/base.html +++ b/python/fatcat_web/templates/base.html @@ -59,8 +59,8 @@
{{ current_user.username }}
- Edits in Progress - History + {# Edits in Progress #} + Edit History
Account Logout diff --git a/python/fatcat_web/templates/changelog.html b/python/fatcat_web/templates/changelog.html index f33fe7c8..df51e7db 100644 --- a/python/fatcat_web/templates/changelog.html +++ b/python/fatcat_web/templates/changelog.html @@ -4,7 +4,7 @@

Recent Changes
changelog

-Limited to the most recent ~50 entries. +Limited to the most recent entries. {#
Changelog
Index diff --git a/python/fatcat_web/templates/editgroup_reviewable.html b/python/fatcat_web/templates/editgroup_reviewable.html new file mode 100644 index 00000000..f3d75353 --- /dev/null +++ b/python/fatcat_web/templates/editgroup_reviewable.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} +{% block body %} + +

Reviewable Editgroups +

+ +Limited to the most recent entries. + + + + {% for editgroup in entries %} +
Submitted (UTC) + Editgroup + Editor + Description +
{{ editgroup.submitted }} + {{ editgroup.editgroup_id }} + {{ editgroup.editor_id }} + {% if editgroup.description != None %}{{ editgroup.description }}{% endif %} + {% endfor %} +
+ +{% endblock %} diff --git a/python/fatcat_web/templates/editor_editgroups.html b/python/fatcat_web/templates/editor_editgroups.html index cb9b2f56..7643981f 100644 --- a/python/fatcat_web/templates/editor_editgroups.html +++ b/python/fatcat_web/templates/editor_editgroups.html @@ -1,25 +1,31 @@ {% extends "base.html" %} {% block body %} -

Editor Changelog: {{ editor.username }} +

Edit History
- - editor {{ editor.editor_id }} + editor + {{ editor.username }} +

-

Changes accepted (aka, merged editgroups): - {# {% for editgroup in editgroups %} - {#
Created (UTC) +
Created (UTC) #} + Status Editgroup - Editor Description
{{ editgroup.created }} +
{{ editgroup.created }} #} + {% if editgroup.changelog_index %} + Merged
(#{{ editgroup.changelog_index }}) + {% elif editgroup.submitted %} + Submitted
({{ editgroup.submitted }}) + {% else %} + Work in Progress + {% endif %} 		{{ editgroup.editgroup_id }} - {{ editgroup.editor_id }} {% if editgroup.description != None %}{{ editgroup.description }}{% endif %} {% endfor %}
diff --git a/python/fatcat_web/templates/editor_view.html b/python/fatcat_web/templates/editor_view.html index eef4f040..4d94ceaf 100644 --- a/python/fatcat_web/templates/editor_view.html +++ b/python/fatcat_web/templates/editor_view.html @@ -7,6 +7,6 @@ -

View editor's changelog +

View editor's editgroups {% endblock %} -- cgit v1.2.3 From ca59441dab7bd99645c98c03dceb314c5d9fae5d Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Wed, 3 Apr 2019 19:29:16 -0700 Subject: small UI tweaks for editgroups/account --- python/fatcat_web/routes.py | 9 +++++++-- python/fatcat_web/templates/auth_account.html | 2 +- python/fatcat_web/templates/base.html | 2 +- python/fatcat_web/templates/changelog.html | 23 ++++++++++++++++------ .../fatcat_web/templates/editgroup_reviewable.html | 20 +++++++++++++------ python/fatcat_web/templates/editgroup_view.html | 2 +- python/fatcat_web/templates/editor_editgroups.html | 10 +++++++--- python/fatcat_web/templates/editor_view.html | 2 +- 8 files changed, 49 insertions(+), 21 deletions(-) (limited to 'python/fatcat_web/templates/base.html') diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py index e20cd3c5..bce3c529 100644 --- a/python/fatcat_web/routes.py +++ b/python/fatcat_web/routes.py @@ -425,6 +425,9 @@ def editor_editgroups(ident): try: editor = api.get_editor(ident) editgroups = api.get_editor_editgroups(ident, limit=50) + # cheaper than API-side expand? + for eg in editgroups: + eg.editor = editor except ApiException as ae: abort(ae.status) return render_template('editor_editgroups.html', editor=editor, @@ -434,7 +437,7 @@ def editor_editgroups(ident): def changelog_view(): try: #limit = int(request.args.get('limit', 10)) - entries = api.get_changelog() + entries = api.get_changelog() # TODO: expand="editors" except ApiException as ae: abort(ae.status) return render_template('changelog.html', entries=entries) @@ -444,6 +447,8 @@ def changelog_entry_view(index): try: entry = api.get_changelog_entry(int(index)) entry.editgroup.editor = api.get_editor(entry.editgroup.editor_id) + entry.editgroup.annotations = \ + api.get_editgroup_annotations(entry.editgroup_id, expand="editors") except ApiException as ae: abort(ae.status) return render_template('changelog_view.html', entry=entry, editgroup=entry.editgroup) @@ -452,7 +457,7 @@ def changelog_entry_view(index): def reviewable_view(): try: #limit = int(request.args.get('limit', 10)) - entries = api.get_editgroups_reviewable() + entries = api.get_editgroups_reviewable(expand="editors") except ApiException as ae: abort(ae.status) return render_template('editgroup_reviewable.html', entries=entries) diff --git a/python/fatcat_web/templates/auth_account.html b/python/fatcat_web/templates/auth_account.html index 8a251042..4b1562d7 100644 --- a/python/fatcat_web/templates/auth_account.html +++ b/python/fatcat_web/templates/auth_account.html @@ -2,7 +2,7 @@ {% block body %}

- + Account Settings

diff --git a/python/fatcat_web/templates/base.html b/python/fatcat_web/templates/base.html index 37641c90..fa5f8f7f 100644 --- a/python/fatcat_web/templates/base.html +++ b/python/fatcat_web/templates/base.html @@ -62,7 +62,7 @@ {# Edits in Progress #} Edit History
- Account + Account Logout diff --git a/python/fatcat_web/templates/changelog.html b/python/fatcat_web/templates/changelog.html index 0d4ae657..7d5505bc 100644 --- a/python/fatcat_web/templates/changelog.html +++ b/python/fatcat_web/templates/changelog.html @@ -8,16 +8,27 @@ Limited to the most recent entries. {% for entry in entries %} -
Changelog
Index - 		Timestamp (UTC) Editgroup - Editor Description
{{ entry.index }} - {{ entry.timestamp.strftime("%Y-%m-%d %H:%M:%S") }} - {{ entry.editgroup_id }} - {{ entry.editgroup.editor_id }} +
#{{ entry.index }} +
{{ entry.timestamp.strftime("%Y-%m-%d %H:%M:%S") }} + 		+ {# + {% if entry.editgroup.editor.is_bot %} + + {% else %} + + {% endif %} + #} + Editor: + {{ entry.editgroup.editor_id[:8] }}... + +
+ + {{ entry.editgroup.editgroup_id }} + 		{% if entry.editgroup.description != None %}{{ entry.editgroup.description }}{% endif %} {% endfor %}
diff --git a/python/fatcat_web/templates/editgroup_reviewable.html b/python/fatcat_web/templates/editgroup_reviewable.html index f3d75353..b1ece6af 100644 --- a/python/fatcat_web/templates/editgroup_reviewable.html +++ b/python/fatcat_web/templates/editgroup_reviewable.html @@ -7,15 +7,23 @@ Limited to the most recent entries. - {% for editgroup in entries %} -
Submitted (UTC) - Editgroup - Editor +
Editgroup Description
{{ editgroup.submitted }} - {{ editgroup.editgroup_id }} - {{ editgroup.editor_id }} +
+ {% if editgroup.editor.is_bot %} + + {% else %} + + {% endif %} + {{ editgroup.editor.username }} +
+ Submitted: {{ editgroup.submitted.strftime("%Y-%m-%d %H:%M:%S") }} +
+ + {{ editgroup.editgroup_id }} + 		{% if editgroup.description != None %}{{ editgroup.description }}{% endif %} {% endfor %}
diff --git a/python/fatcat_web/templates/editgroup_view.html b/python/fatcat_web/templates/editgroup_view.html index 31f9026f..f7f3ad45 100644 --- a/python/fatcat_web/templates/editgroup_view.html +++ b/python/fatcat_web/templates/editgroup_view.html @@ -131,7 +131,7 @@ reviewable bundle. None! {% endfor %} -{% if auth_to.annotate and not editgroup.changelog_index %} +{% if not editgroup.changelog_index and auth_to.annotate %}

Add Comment

diff --git a/python/fatcat_web/templates/editor_editgroups.html b/python/fatcat_web/templates/editor_editgroups.html index abfd9772..3c3dd20d 100644 --- a/python/fatcat_web/templates/editor_editgroups.html +++ b/python/fatcat_web/templates/editor_editgroups.html @@ -19,13 +19,17 @@ {% for editgroup in editgroups %}
{{ editgroup.created.strftime("%Y-%m-%d %H:%M:%S") }} #} {% if editgroup.changelog_index %} - Merged
(#{{ editgroup.changelog_index }}) + Merged +
#{{ editgroup.changelog_index }} {% elif editgroup.submitted %} - Submitted
({{ editgroup.submitted.strftime("%Y-%m-%d %H:%M:%S") }}) + Submitted +
{{ editgroup.submitted.strftime("%Y-%m-%d %H:%M:%S") }} {% else %} Work in Progress {% endif %} - 		{{ editgroup.editgroup_id }} + + {{ editgroup.editgroup_id }} + {% if editgroup.description != None %}{{ editgroup.description }}{% endif %} {% endfor %}
diff --git a/python/fatcat_web/templates/editor_view.html b/python/fatcat_web/templates/editor_view.html index 4d94ceaf..000922c0 100644 --- a/python/fatcat_web/templates/editor_view.html +++ b/python/fatcat_web/templates/editor_view.html @@ -7,6 +7,6 @@
-

View editor's editgroups +

Edit History {% endblock %} -- cgit v1.2.3 From 855f2c44de8a900766bdc1f80fb8d3b54e0871e9 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Wed, 3 Apr 2019 19:40:07 -0700 Subject: editor-specific annotation view --- python/fatcat_web/routes.py | 12 ++++++-- python/fatcat_web/templates/base.html | 2 +- .../fatcat_web/templates/editor_annotations.html | 35 ++++++++++++++++++++++ python/fatcat_web/templates/editor_view.html | 1 + 4 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 python/fatcat_web/templates/editor_annotations.html (limited to 'python/fatcat_web/templates/base.html') diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py index bce3c529..7b406ff5 100644 --- a/python/fatcat_web/routes.py +++ b/python/fatcat_web/routes.py @@ -357,8 +357,6 @@ def editgroup_create_annotation(ident): abort(ae.status) return redirect('/editgroup/{}'.format(ident)) -# XXX: editor's annotations - @app.route('/editgroup//accept', methods=['POST']) @login_required def editgroup_accept(ident): @@ -433,6 +431,16 @@ def editor_editgroups(ident): return render_template('editor_editgroups.html', editor=editor, editgroups=editgroups) +@app.route('/editor//annotations', methods=['GET']) +def editor_annotations(ident): + try: + editor = api.get_editor(ident) + annotations = api.get_editor_annotations(ident, limit=50) + except ApiException as ae: + abort(ae.status) + return render_template('editor_annotations.html', editor=editor, + annotations=annotations) + @app.route('/changelog', methods=['GET']) def changelog_view(): try: diff --git a/python/fatcat_web/templates/base.html b/python/fatcat_web/templates/base.html index fa5f8f7f..dda905e0 100644 --- a/python/fatcat_web/templates/base.html +++ b/python/fatcat_web/templates/base.html @@ -59,8 +59,8 @@

{{ current_user.username }}
- {# Edits in Progress #} Edit History + Comment History
Account Logout diff --git a/python/fatcat_web/templates/editor_annotations.html b/python/fatcat_web/templates/editor_annotations.html new file mode 100644 index 00000000..c46039f5 --- /dev/null +++ b/python/fatcat_web/templates/editor_annotations.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} +{% block body %} + +

Comments and Annotations +
+ editor + {{ editor.username }} + + +
+

+ +
+{% for annotation in annotations %} +
+
+ On + {{ annotation.editgroup_id }} + + at {{ annotation.created.strftime("%Y-%m-%d %H:%M:%S") }} +
+ {% if annotation.extra %} +
+ {{ entity_macros.extra_metadata(annotation.extra) }} +
+ {% endif %} +
+ {{ annotation.comment_markdown|markdown(escape=True) }} +
+
+{% else %} + None! +{% endfor %} + +{% endblock %} diff --git a/python/fatcat_web/templates/editor_view.html b/python/fatcat_web/templates/editor_view.html index 000922c0..c62f8d93 100644 --- a/python/fatcat_web/templates/editor_view.html +++ b/python/fatcat_web/templates/editor_view.html @@ -8,5 +8,6 @@

Edit History +

Comments and Annotation History {% endblock %} -- cgit v1.2.3