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

Convert history app to use the new class based permissions

Browse Source
This commit is contained in:
Roberto Rosario
2011-12-08 16:36:39 -04:00
parent e5e2117771
commit 3ec2c05f25
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/history/__init__.py
View File

@@ -1,14 +1,14 @@
from django.utils.translation import ugettext_lazy as _
from permissions.api import register_permission, set_namespace_title
from project_tools.api import register_tool
from permissions.models import PermissionNamespace, Permission
PERMISSION_HISTORY_VIEW = {'namespace': 'history', 'name': u'history_view', 'label': _(u'Access the history app')}
history_namespace = PermissionNamespace('history', _(u'History'))
set_namespace_title('history', _(u'History'))
register_permission(PERMISSION_HISTORY_VIEW)
PERMISSION_HISTORY_VIEW = Permission.objects.register(history_namespace, 'history_view', _(u'Access the history app'))
# TODO: support permissions AND operand
# encapsulate into document_history_list and require DOCUMENT_VIEW and HISTORY_VIEW
history_list = {'text': _(u'history'), 'view': 'history_list', 'famfam': 'book', 'icon': 'book.png', 'permissions': [PERMISSION_HISTORY_VIEW], 'children_views': ['history_view']}
register_tool(history_list)

8
apps/history/views.py
View File

@@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType
from django.db.models.loading import get_model
from django.http import Http404
from permissions.api import check_permissions
from permissions.models import Permission
from common.utils import encapsulate
from history.models import History
@@ -16,7 +16,7 @@ from history.widgets import history_entry_object_link, history_entry_summary
def history_list(request):
check_permissions(request.user, [PERMISSION_HISTORY_VIEW])
Permission.objects.check_permissions(request.user, [PERMISSION_HISTORY_VIEW])
context = {
'object_list': History.objects.all(),
@@ -43,7 +43,7 @@ def history_list(request):
def history_for_object(request, app_label, module_name, object_id):
check_permissions(request.user, [PERMISSION_HISTORY_VIEW])
Permission.objects.check_permissions(request.user, [PERMISSION_HISTORY_VIEW])
model = get_model(app_label, module_name)
if not model:
@@ -73,7 +73,7 @@ def history_for_object(request, app_label, module_name, object_id):
def history_view(request, object_id):
check_permissions(request.user, [PERMISSION_HISTORY_VIEW])
Permission.objects.check_permissions(request.user, [PERMISSION_HISTORY_VIEW])
history = get_object_or_404(History, pk=object_id)