diff --git a/CHANGELOG b/CHANGELOG index 0d047d335..8b4a7302f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -35,6 +35,8 @@ Version 1.5.1 (unreleased) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=15] +Agenda: +- Fixed permission error in list of speakers widget. Participant: - Added permission to see participants also to the manager group. Files: diff --git a/README.rst b/README.rst index 994dc02ef..14d1ab644 100644 --- a/README.rst +++ b/README.rst @@ -26,7 +26,7 @@ Installation on GNU/Linux or Mac OS X 1. Check requirements - Make sure that you have installed Python Programming Language 2 (>= 2.6) + Make sure that you have installed Python Programming Language 2 (>= 2.6.9) on your system. You will also need the Python development headers. For example for Ubuntu run:: @@ -77,7 +77,7 @@ portable version you should observe the following install steps.* 1. Check requirements - Make sure that you have installed Python Programming Language 2 (>= 2.6) + Make sure that you have installed Python Programming Language 2 (>= 2.6.9) and Setuptools on your system. a. Download and run the `Python 32-bit MSI installer diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py index 4e7557e7d..efc0605dc 100644 --- a/openslides/agenda/views.py +++ b/openslides/agenda/views.py @@ -68,7 +68,7 @@ class Overview(TemplateView): if minutes < 10: minutes = "%s%s" % (0, minutes) item.duration = "%s:%s" % (hours, minutes) - if not start is None: + if start is not None: item.tooltip = start + duration if start is None: diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py index 69c37dbcd..468d8c991 100644 --- a/openslides/assignment/models.py +++ b/openslides/assignment/models.py @@ -184,7 +184,7 @@ class Assignment(SlideMixin, AbsoluteUrlMixin, models.Model): participants.append(candidate.person) participants.sort(key=lambda person: person.sort_name) return participants - #return candidates.values_list('person', flat=True) + # return candidates.values_list('person', flat=True) def set_elected(self, person, value=True): candidate = self.assignment_candidates.get(person=person) diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index 833fe4ea9..de8204b4d 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -220,7 +220,7 @@ class PollUpdateView(PollFormView): def get_success_url(self): return_url = '' - if not 'apply' in self.request.POST: + if 'apply' not in self.request.POST: return_url = reverse('assignment_detail', args=[self.poll.assignment.id]) return return_url diff --git a/openslides/mediafile/forms.py b/openslides/mediafile/forms.py index 0516dcd2e..86ba4c443 100644 --- a/openslides/mediafile/forms.py +++ b/openslides/mediafile/forms.py @@ -15,7 +15,7 @@ class MediafileFormMixin(object): """ Method to save the form. Here the override is to delete old files. """ - if not self.instance.pk is None: + if self.instance.pk is not None: old_file = Mediafile.objects.get(pk=self.instance.pk).mediafile if not old_file == self.instance.mediafile: old_file.delete() diff --git a/openslides/motion/models.py b/openslides/motion/models.py index 20111d0e5..7acbce461 100644 --- a/openslides/motion/models.py +++ b/openslides/motion/models.py @@ -73,7 +73,7 @@ class Motion(SlideMixin, AbsoluteUrlMixin, models.Model): """ # TODO: proposal - #master = models.ForeignKey('self', null=True, blank=True) + # master = models.ForeignKey('self', null=True, blank=True) class Meta: permissions = ( @@ -544,8 +544,8 @@ class MotionVersion(AbsoluteUrlMixin, models.Model): creation_time = models.DateTimeField(auto_now=True) """Time when the version was saved.""" - #identifier = models.CharField(max_length=255, verbose_name=ugettext_lazy("Version identifier")) - #note = models.TextField(null=True, blank=True) + # identifier = models.CharField(max_length=255, verbose_name=ugettext_lazy("Version identifier")) + # note = models.TextField(null=True, blank=True) class Meta: unique_together = ("motion", "version_number") @@ -633,11 +633,11 @@ class Category(AbsoluteUrlMixin, models.Model): class Meta: ordering = ['prefix'] -## class Comment(models.Model): - ## motion_version = models.ForeignKey(MotionVersion) - ## text = models.TextField() - ## author = PersonField() - ## creation_time = models.DateTimeField(auto_now=True) +# class Comment(models.Model): + # motion_version = models.ForeignKey(MotionVersion) + # text = models.TextField() + # author = PersonField() + # creation_time = models.DateTimeField(auto_now=True) class MotionLog(models.Model): @@ -739,8 +739,8 @@ class MotionPoll(RelatedModelMixin, CollectInvalid, CollectVotesCast, def set_options(self): """Create the option class for this poll.""" - #TODO: maybe it is possible with .create() to call this without poll=self - # or call this in save() + # TODO: maybe it is possible with .create() to call this without poll=self + # or call this in save() self.get_option_class()(poll=self).save() def get_related_model(self): diff --git a/openslides/motion/views.py b/openslides/motion/views.py index dc1fb7d9d..f2d6627d0 100644 --- a/openslides/motion/views.py +++ b/openslides/motion/views.py @@ -181,7 +181,7 @@ class MotionCreateView(MotionEditMixin, CreateView): """ response = super(MotionCreateView, self).form_valid(form) self.object.write_log([ugettext_noop('Motion created')], self.request.user) - if (not 'submitter' in form.cleaned_data or + if ('submitter' not in form.cleaned_data or not form.cleaned_data['submitter']): self.object.add_submitter(self.request.user) return response diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py index 34c844af3..f4065a853 100644 --- a/openslides/participant/forms.py +++ b/openslides/participant/forms.py @@ -134,7 +134,7 @@ class GroupForm(forms.ModelForm, CssClassMixin): # TODO: Check this in clean_users or clean_permissions if (self.request and not self.request.user.is_superuser and - not self.request.user in self.cleaned_data['users'] and + self.request.user not in self.cleaned_data['users'] and not Group.objects.exclude(pk=self.instance.pk).filter( permissions__in=[get_protected_perm()], user__pk=self.request.user.pk).exists()):