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

Events: Improve and merge views

Browse Source 
Merge the current user event, the user events and the object events
views.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-24 01:34:42 -04:00
parent c1c8d1dc2d
commit 012c027994
4 changed files with 55 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mayan/apps/events/apps.py
View File

@@ -1,12 +1,11 @@
from __future__ import unicode_literals
from django.apps import apps
from django.contrib.auth import get_user_model
from django.utils.translation import ugettext_lazy as _
from mayan.apps.common import (
MayanAppConfig, menu_list_facet, menu_object, menu_secondary,
menu_tools, menu_topbar, menu_user
MayanAppConfig, menu_object, menu_secondary, menu_tools, menu_topbar,
menu_user
)
from mayan.apps.common.widgets import TwoStateWidget
from mayan.apps.navigation import SourceColumn
@@ -15,8 +14,7 @@ from .licenses import * # NOQA
from .links import (
link_current_user_events, link_event_types_subscriptions_list,
link_events_list, link_notification_mark_read,
link_notification_mark_read_all, link_user_events,
link_user_notifications_list
link_notification_mark_read_all, link_user_notifications_list
)
from .widgets import (
widget_event_object_link, widget_event_type_link, widget_event_user_link
@@ -36,7 +34,6 @@ class EventsApp(MayanAppConfig):
Action = apps.get_model(app_label='actstream', model_name='Action')
Notification = self.get_model(model_name='Notification')
StoredEventType = self.get_model(model_name='StoredEventType')
User = get_user_model()
SourceColumn(
attribute='timestamp', is_identifier=True,
@@ -86,9 +83,6 @@ class EventsApp(MayanAppConfig):
source=Notification, widget=TwoStateWidget
)
menu_list_facet.bind_links(
links=(link_user_events,), sources=(User,)
)
menu_object.bind_links(
links=(link_notification_mark_read,), sources=(Notification,)
)

1
mayan/apps/events/icons.py
View File

@@ -7,7 +7,6 @@ icon_event_types_subscriptions_list = Icon(
)
icon_events_list = Icon(driver_name='fontawesome', symbol='list-ol')
icon_events_for_object = Icon(driver_name='fontawesome', symbol='list-ol')
icon_events_user_list = Icon(driver_name='fontawesome', symbol='list-ol')
icon_object_event_types_user_subcriptions_list = Icon(
driver_name='fontawesome', symbol='rss'
)

9
mayan/apps/events/links.py
View File

@@ -7,8 +7,7 @@ from mayan.apps.navigation import Link
from .icons import (
icon_event_types_subscriptions_list, icon_events_for_object,
icon_events_list, icon_events_user_list,
icon_object_event_types_user_subcriptions_list,
icon_events_list, icon_object_event_types_user_subcriptions_list,
icon_user_notifications_list
)
from .permissions import permission_events_view
@@ -33,7 +32,7 @@ def get_kwargs_factory(variable_name):
link_current_user_events = Link(
icon_class=icon_events_user_list, text=_('My events'),
icon_class=icon_events_list, text=_('My events'),
view='events:current_user_events'
)
link_events_details = Link(
@@ -67,10 +66,6 @@ link_object_event_types_user_subcriptions_list = Link(
permissions=(permission_events_view,), text=_('Subscriptions'),
view='events:object_event_types_user_subcriptions_list',
)
link_user_events = Link(
args='resolved_object.pk', icon_class=icon_events_user_list,
text=_('User events'), view='events:user_events'
)
link_user_notifications_list = Link(
html_data={
'apw-attribute': 'count', 'apw-interval': '5000',

107
mayan/apps/events/views.py
View File

@@ -1,7 +1,6 @@
from __future__ import absolute_import, unicode_literals
from django.contrib import messages
from django.contrib.auth import get_user_model
from django.contrib.contenttypes.models import ContentType
from django.http import Http404, HttpResponseRedirect
from django.shortcuts import get_object_or_404
@@ -20,7 +19,7 @@ from .forms import (
EventTypeUserRelationshipFormSet, ObjectEventTypeUserRelationshipFormSet
)
from .icons import (
icon_events_list, icon_events_user_list, icon_user_notifications_list
icon_events_list, icon_user_notifications_list
)
from .links import link_event_types_subscriptions_list
from .models import StoredEventType
@@ -144,45 +143,43 @@ class NotificationMarkReadAll(SimpleView):
class ObjectEventListView(EventListView):
view_permissions = None
def dispatch(self, request, *args, **kwargs):
self.object_content_type = get_object_or_404(
def _get_object(self):
content_type = get_object_or_404(
klass=ContentType, app_label=self.kwargs['app_label'],
model=self.kwargs['model']
)
try:
self.content_object = self.object_content_type.get_object_for_this_type(
pk=self.kwargs['object_id']
)
except self.object_content_type.model_class().DoesNotExist:
raise Http404
AccessControlList.objects.check_access(
permissions=permission_events_view, user=request.user,
obj=self.content_object
return get_object_or_404(
klass=content_type.model_class(), pk=self.kwargs['object_id']
)
return super(
ObjectEventListView, self
).dispatch(request, *args, **kwargs)
def get_extra_context(self):
context = super(ObjectEventListView, self).get_extra_context()
context.update({
'hide_object': True,
'no_results_icon': icon_events_list,
'no_results_text': _(
'Events are actions that have been performed to this object '
'or using this object.'
),
'no_results_title': _('There are no events for this object'),
'object': self.content_object,
'title': _('Events for: %s') % self.content_object,
})
context.update(
{
'hide_object': True,
'no_results_icon': icon_events_list,
'no_results_text': _(
'Events are actions that have been performed to this '
'object or using this object.'
),
'no_results_title': _('There are no events for this object'),
'object': self.get_object(),
'title': _('Events for: %s') % self.get_object(),
}
)
return context
def get_object(self):
obj = self._get_object()
AccessControlList.objects.check_access(
permissions=permission_events_view, user=self.request.user,
obj=obj
)
return obj
def get_object_list(self):
return any_stream(self.content_object)
return any_stream(self.get_object())
class ObjectEventTypeSubscriptionListView(FormView):
@@ -190,7 +187,9 @@ class ObjectEventTypeSubscriptionListView(FormView):
def dispatch(self, *args, **kwargs):
EventType.refresh()
return super(ObjectEventTypeSubscriptionListView, self).dispatch(*args, **kwargs)
return super(ObjectEventTypeSubscriptionListView, self).dispatch(
*args, **kwargs
)
def form_valid(self, form):
try:
@@ -203,7 +202,9 @@ class ObjectEventTypeSubscriptionListView(FormView):
)
else:
messages.success(
self.request, _('Object event subscriptions updated successfully')
self.request, _(
'Object event subscriptions updated successfully.'
)
)
return super(
@@ -255,35 +256,27 @@ class ObjectEventTypeSubscriptionListView(FormView):
return ModelEventType.get_for_instance(instance=self.get_object())
class UserEventListView(SingleObjectListView):
view_permission = permission_events_view
class UserEventListView(ObjectEventListView):
def get_extra_context(self):
return {
'hide_object': True,
'no_results_icon': icon_events_user_list,
'no_results_text': _(
'Events are actions that have been performed to this '
'user account or by this user account.'
),
'no_results_title': _('There are no events for this user'),
'object': self.get_user(),
'title': _(
'Events for user: %s'
) % self.get_user(),
}
def get_object_list(self):
return Action.objects.actor(obj=self.get_user())
def get_user(self):
return get_object_or_404(klass=get_user_model(), pk=self.kwargs['pk'])
context = super(UserEventListView, self).get_extra_context()
context.update(
{
'no_results_text': _(
'Events are actions that have been performed to this '
'user account or by this user account.'
),
'no_results_title': _('There are no events for this user'),
'object': self.get_object(),
'title': _(
'Events for user: %s'
) % self.get_object(),
}
)
return context
class CurrentUserEventListView(UserEventListView):
view_permission = None
def get_user(self):
def get_object(self):
return self.request.user