ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1393 from emanuelschuetze/bsmselect-updated

Browse Source 
Reduce the usage of bsmselect jquery plugin.
This commit is contained in:
Norman Jäckel 2015-01-09 22:17:00 +01:00
commit adefb49457
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/core/templates/base.html
View File

@ -136,7 +136,7 @@
<script type="text/javascript" src="{% static 'js/jquery/jquery.bsmselect.js' %}"></script> <script type="text/javascript" src="{% static 'js/jquery/jquery.bsmselect.js' %}"></script>
<script type="text/javascript"> <script type="text/javascript">
// use jquery-bsmselect for all <select multiple> form elements // use jquery-bsmselect for all <select multiple> form elements
$("select[multiple]").bsmSelect({ $("select[multiple]:not(.dont_use_bsmselect)").bsmSelect({
removeLabel: '<sup><b>X</b></sup>', removeLabel: '<sup><b>X</b></sup>',
containerClass: 'bsmContainer', containerClass: 'bsmContainer',
listClass: 'bsmList-custom', listClass: 'bsmList-custom',

7
openslides/participant/forms.py
View File

@ -84,10 +84,11 @@ class UserUpdateForm(UserCreateForm):
class GroupForm(forms.ModelForm, CssClassMixin): class GroupForm(forms.ModelForm, CssClassMixin):
permissions = LocalizedModelMultipleChoiceField( permissions = LocalizedModelMultipleChoiceField(
queryset=Permission.objects.all(), label=ugettext_lazy('Permissions'), queryset=Permission.objects.all(), label=ugettext_lazy('Permissions'), required=False,
required=False) widget=forms.SelectMultiple(attrs={'class': 'dont_use_bsmselect'}))
users = forms.ModelMultipleChoiceField( users = forms.ModelMultipleChoiceField(
queryset=User.objects.all(), label=ugettext_lazy('Participants'), required=False) queryset=User.objects.all(), label=ugettext_lazy('Participants'), required=False,
widget=forms.SelectMultiple(attrs={'class': 'dont_use_bsmselect'}))
class Meta: class Meta:
model = Group model = Group