Skip to content
Snippets Groups Projects
Commit 7d1feca6 authored by Andreas Valder's avatar Andreas Valder
Browse files

add changelog to edit tooltip, closes #350

parent eddd5a66
No related branches found
No related tags found
No related merge requests found
...@@ -131,6 +131,14 @@ def getfielddescription(path): ...@@ -131,6 +131,14 @@ def getfielddescription(path):
desc = '<br>'+desc desc = '<br>'+desc
return desc return desc
@app.template_filter(name='getfieldchangelog')
def getfieldchangelog(path):
p = parseeditpath(path)
changelog = query('SELECT * FROM changelog LEFT JOIN users ON (changelog.who = users.id) WHERE `table` = ? AND `id_value` = ? and `field` = ? ORDER BY `when` DESC LIMIT 5', p['table'], p['id'], p['column'])
for entry in changelog:
entry['path'] = '.'.join([entry['table'], entry['id_value'], entry['field']])
return changelog
@app.route('/internal/edit', methods=['GET', 'POST']) @app.route('/internal/edit', methods=['GET', 'POST'])
@mod_required @mod_required
@csrf_protect @csrf_protect
......
...@@ -298,7 +298,7 @@ $('#embedcodebtn').popover( ...@@ -298,7 +298,7 @@ $('#embedcodebtn').popover(
{% macro moderator_editor (path,value,reload=false) %} {% macro moderator_editor (path,value,reload=false) %}
{% if ismod() %} {% if ismod() %}
<span class="moderator_editor" data-path="{{path|join('.')}}" data-reload="{{ reload|int }}" > <span class="moderator_editor" data-path="{{path|join('.')}}" data-reload="{{ reload|int }}" >
<a class="moderator_editor_sign btn btn-default" title="{{path|join('.')}}{{ path|join('.')|getfielddescription }}" data-toggle="tooltip" tabindex="0" style="padding: 3px; margin-right: 5px;"> <a class="moderator_editor_sign btn btn-default" title="{{path|join('.')}}{{ path|join('.')|getfielddescription }}{% for l in path|join('.')|getfieldchangelog %}<br>{% if (l.who != l.who|string) %}{{ l.name }} ({{ l.who }}){% else %}{{ l.who }}{%endif%} <{{ l.when }}>: {{ l.value_new }}{% endfor %}" data-toggle="tooltip" tabindex="0" style="padding: 3px; margin-right: 5px;">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<span class="moderator_editor_value">{{ value|fixnl|safe }}</span> <span class="moderator_editor_value">{{ value|fixnl|safe }}</span>
...@@ -310,7 +310,7 @@ $('#embedcodebtn').popover( ...@@ -310,7 +310,7 @@ $('#embedcodebtn').popover(
{% macro moderator_checkbox (path,value) %} {% macro moderator_checkbox (path,value) %}
{% if ismod() %} {% if ismod() %}
<input title="{{path|join('.')}}{{ path|join('.')|getfielddescription }}" data-toggle="tooltip" type="checkbox" data-path="{{path|join('.')}}" {% if value %} checked {% endif %} onchange="moderator.editor.changeboxclick(this)"/> <input title="{{path|join('.')}}{{ path|join('.')|getfielddescription }}{% for l in path|join('.')|getfieldchangelog %}<br>{% if (l.who != l.who|string) %}{{ l.name }} ({{ l.who }}){% else %}{{ l.who }}{%endif%} <{{ l.when }}>: {{ l.value_new }}{% endfor %}" data-toggle="tooltip" type="checkbox" data-path="{{path|join('.')}}" {% if value %} checked {% endif %} onchange="moderator.editor.changeboxclick(this)"/>
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment