Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Roman Karwacik
website
Commits
7d1feca6
Commit
7d1feca6
authored
Jan 29, 2018
by
Andreas Valder
Browse files
add changelog to edit tooltip, closes #350
parent
eddd5a66
Changes
2
Hide whitespace changes
Inline
Side-by-side
edit.py
View file @
7d1feca6
...
...
@@ -131,6 +131,14 @@ def getfielddescription(path):
desc
=
'<br>'
+
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'
])
@
mod_required
@
csrf_protect
...
...
templates/macros.html
View file @
7d1feca6
...
...
@@ -298,7 +298,7 @@ $('#embedcodebtn').popover(
{% macro moderator_editor (path,value,reload=false) %}
{% if ismod() %}
<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>
</a>
<span
class=
"moderator_editor_value"
>
{{ value|fixnl|safe }}
</span>
...
...
@@ -310,7 +310,7 @@ $('#embedcodebtn').popover(
{% macro moderator_checkbox (path,value) %}
{% 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 %}
{% endmacro %}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment