matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the tag widget for Django 1.11.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-04-05 07:19:39 -04:00
parent c46a2cd372
commit ae2297b0bd
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/appearance/static/appearance/js/mayan_app.js
View File

@@ -59,16 +59,16 @@ App.MultiObjectFormProcess = function ($form, options) {
App.tagSelectionTemplate = function (tag, container) {
var $tag = $(
'<span class="label label-tag" style="background: ' + tag.element.style.color + ';"> ' + tag.text + '</span>'
'<span class="label label-tag" style="background: ' + tag.element.dataset.color + ';"> ' + tag.text + '</span>'
);
container[0].style.background = tag.element.style.color;
container[0].style.background = tag.element.dataset.color;
return $tag;
}
App.tagResultTemplate = function (tag) {
if (!tag.element) { return ''; }
var $tag = $(
'<span class="label label-tag" style="background: ' + tag.element.style.color + ';"> ' + tag.text + '</span>'
'<span class="label label-tag" style="background: ' + tag.element.dataset.color + ';"> ' + tag.text + '</span>'
);
return $tag;
}

2
mayan/apps/tags/templates/tags/forms/widgets/tag_select_option.html Normal file
View File

@@ -0,0 +1,2 @@
{% include 'django/forms/widgets/select_option.html' %}

27
mayan/apps/tags/widgets.py
View File

@@ -11,29 +11,22 @@ from .permissions import permission_tag_view
class TagFormWidget(forms.SelectMultiple):
option_template_name = 'tags/forms/widgets/tag_select_option.html'
def __init__(self, *args, **kwargs):
self.queryset = kwargs.pop('queryset')
return super(TagFormWidget, self).__init__(*args, **kwargs)
def render_option(self, selected_choices, option_value, option_label):
if option_value is None:
option_value = ''
option_value = force_text(option_value)
if option_value in selected_choices:
selected_html = mark_safe(' selected="selected"')
if not self.allow_multiple_selected:
# Only allow for a single selection.
selected_choices.remove(option_value)
else:
selected_html = ''
return format_html(
'<option style="color:{};" value="{}"{}>{}</option>',
self.queryset.get(pk=option_value).color,
option_value,
selected_html,
force_text(option_label)
def create_option(self, name, value, label, selected, index, subindex=None, attrs=None):
result = super(TagFormWidget, self).create_option(
name=name, value=value, label=label, selected=selected,
index=index, subindex=subindex, attrs=attrs
)
result['attrs']['data-color'] = self.queryset.get(pk=value).color
return result
def widget_document_tags(document, user):
"""