Removed the projector App

This commit is contained in:
Oskar Hahn 2015-06-29 13:31:07 +02:00
parent db0a4224c2
commit 16fa6bfffc
7 changed files with 7 additions and 35 deletions

View File

@ -11,7 +11,6 @@ from django.utils.translation import ugettext_lazy, ugettext_noop
from openslides.core.config import config from openslides.core.config import config
from openslides.core.models import Tag from openslides.core.models import Tag
from openslides.projector.models import SlideMixin
from openslides.users.models import User from openslides.users.models import User
from openslides.utils.exceptions import OpenSlidesError from openslides.utils.exceptions import OpenSlidesError
from openslides.utils.models import RESTModelMixin from openslides.utils.models import RESTModelMixin
@ -82,7 +81,7 @@ class ItemManager(models.Manager):
weight=weight) weight=weight)
class Item(RESTModelMixin, SlideMixin, models.Model): class Item(RESTModelMixin, models.Model):
""" """
An Agenda Item An Agenda Item
""" """
@ -303,19 +302,6 @@ class Item(RESTModelMixin, SlideMixin, models.Model):
# The list of speakers is empty. # The list of speakers is empty.
return None return None
def is_active_slide(self):
"""
Returns True if the slide is active. If the slide is a related item,
Returns True if the related object is active.
"""
if super(Item, self).is_active_slide():
value = True
elif self.content_object and isinstance(self.content_object, SlideMixin):
value = self.content_object.is_active_slide()
else:
value = False
return value
@property @property
def item_no(self): def item_no(self):
item_no = None item_no = None

View File

@ -14,7 +14,6 @@ from openslides.poll.models import (
CollectDefaultVotesMixin, CollectDefaultVotesMixin,
PublishPollMixin, PublishPollMixin,
) )
from openslides.projector.models import SlideMixin
from openslides.users.models import User from openslides.users.models import User
from openslides.utils.exceptions import OpenSlidesError from openslides.utils.exceptions import OpenSlidesError
from openslides.utils.models import RESTModelMixin from openslides.utils.models import RESTModelMixin
@ -55,7 +54,7 @@ class AssignmentRelatedUser(RESTModelMixin, models.Model):
return self.assignment return self.assignment
class Assignment(RESTModelMixin, SlideMixin, models.Model): class Assignment(RESTModelMixin, models.Model):
slide_callback_name = 'assignment' slide_callback_name = 'assignment'
PHASE_SEARCH = 0 PHASE_SEARCH = 0
@ -338,7 +337,7 @@ class AssignmentOption(RESTModelMixin, BaseOption):
return self.poll.assignment return self.poll.assignment
class AssignmentPoll(RESTModelMixin, SlideMixin, CollectDefaultVotesMixin, class AssignmentPoll(RESTModelMixin, CollectDefaultVotesMixin,
PublishPollMixin, BasePoll): PublishPollMixin, BasePoll):
slide_callback_name = 'assignmentpoll' slide_callback_name = 'assignmentpoll'
option_class = AssignmentOption option_class = AssignmentOption

View File

@ -4,12 +4,11 @@ from django.db import models
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy, ugettext_noop from django.utils.translation import ugettext_lazy, ugettext_noop
from openslides.projector.models import SlideMixin
from openslides.users.models import User from openslides.users.models import User
from openslides.utils.models import RESTModelMixin from openslides.utils.models import RESTModelMixin
class Mediafile(RESTModelMixin, SlideMixin, models.Model): class Mediafile(RESTModelMixin, models.Model):
""" """
Class for uploaded files which can be delivered under a certain url. Class for uploaded files which can be delivered under a certain url.
""" """

View File

@ -15,14 +15,13 @@ from openslides.poll.models import (
BaseVote, BaseVote,
CollectDefaultVotesMixin, CollectDefaultVotesMixin,
) )
from openslides.projector.models import SlideMixin
from openslides.users.models import User from openslides.users.models import User
from openslides.utils.models import RESTModelMixin from openslides.utils.models import RESTModelMixin
from .exceptions import WorkflowError from .exceptions import WorkflowError
class Motion(RESTModelMixin, SlideMixin, models.Model): class Motion(RESTModelMixin, models.Model):
""" """
The Motion Class. The Motion Class.
@ -660,8 +659,7 @@ class MotionOption(RESTModelMixin, BaseOption):
return self.poll.motion return self.poll.motion
class MotionPoll(RESTModelMixin, SlideMixin, CollectDefaultVotesMixin, class MotionPoll(RESTModelMixin, CollectDefaultVotesMixin, BasePoll):
BasePoll):
"""The Class to saves the vote result for a motion poll.""" """The Class to saves the vote result for a motion poll."""
slide_callback_name = 'motionpoll' slide_callback_name = 'motionpoll'

View File

@ -1 +0,0 @@
default_app_config = 'openslides.projector.apps.ProjectorAppConfig'

View File

@ -1,8 +0,0 @@
class SlideMixin(object):
"""
Deprecated.
Will be reused or removed when more slides are implemented for the
OpenSlides 2.0 projector API
"""
pass

View File

@ -14,7 +14,6 @@ from django.db import models
from django.utils.translation import ugettext_lazy, ugettext_noop from django.utils.translation import ugettext_lazy, ugettext_noop
from openslides.core.config import config from openslides.core.config import config
from openslides.projector.models import SlideMixin
from openslides.utils.models import RESTModelMixin from openslides.utils.models import RESTModelMixin
from .exceptions import UserError from .exceptions import UserError
@ -87,7 +86,7 @@ class UserManager(BaseUserManager):
return ''.join([choice(chars) for i in range(size)]) return ''.join([choice(chars) for i in range(size)])
class User(RESTModelMixin, SlideMixin, PermissionsMixin, AbstractBaseUser): class User(RESTModelMixin, PermissionsMixin, AbstractBaseUser):
""" """
Model for users in OpenSlides. A client can login as a user with Model for users in OpenSlides. A client can login as a user with
credentials. A user can also just be used as representation for a person credentials. A user can also just be used as representation for a person