Import and PEP8 cleanups
This commit is contained in:
@@ -3,15 +3,13 @@ from __future__ import absolute_import
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from project_tools.api import register_tool
|
||||
from navigation.api import (bind_links, register_top_menu,
|
||||
register_model_list_columns,
|
||||
register_sidebar_template, Link)
|
||||
from navigation.api import bind_links, register_model_list_columns
|
||||
from common.utils import encapsulate
|
||||
|
||||
from .models import History
|
||||
from .widgets import history_entry_summary, history_entry_type_link
|
||||
from .widgets import history_entry_type_link
|
||||
from .links import history_list, history_details
|
||||
|
||||
|
||||
register_tool(history_list)
|
||||
|
||||
register_model_list_columns(History, [
|
||||
@@ -26,7 +24,7 @@ register_model_list_columns(History, [
|
||||
{
|
||||
'name': _(u'summary'),
|
||||
'attribute': encapsulate(lambda entry: unicode(entry.get_processed_summary()))
|
||||
}
|
||||
}
|
||||
])
|
||||
|
||||
bind_links([History], [history_details])
|
||||
|
||||
@@ -5,7 +5,6 @@ import json
|
||||
|
||||
from django.db import transaction
|
||||
from django.core import serializers
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.db import models
|
||||
from django.db.utils import DatabaseError
|
||||
|
||||
@@ -17,7 +16,7 @@ class EventNamespace(object):
|
||||
def __init__(self, name, label):
|
||||
self.name = name
|
||||
self.label = label
|
||||
|
||||
|
||||
|
||||
class Event(object):
|
||||
@transaction.commit_on_success
|
||||
@@ -37,8 +36,7 @@ class Event(object):
|
||||
history_types_dict[self.namespace.name][self.name] = self
|
||||
except DatabaseError:
|
||||
# Special case for syncdb
|
||||
transaction.rollback()
|
||||
|
||||
transaction.rollback()
|
||||
|
||||
def commit(self, source_object=None, data=None):
|
||||
new_history = History(history_type=self.history_type_obj)
|
||||
|
||||
@@ -16,7 +16,7 @@ from acls.models import AccessEntry
|
||||
from .models import History, HistoryType
|
||||
from .forms import HistoryDetailForm
|
||||
from .permissions import PERMISSION_HISTORY_VIEW
|
||||
from .widgets import history_entry_object_link, history_entry_summary
|
||||
from .widgets import history_entry_object_link
|
||||
|
||||
|
||||
def history_list(request, object_list=None, title=None, extra_context=None):
|
||||
@@ -76,11 +76,11 @@ def history_for_object(request, app_label, module_name, object_id):
|
||||
|
||||
def history_view(request, object_id):
|
||||
history = get_object_or_404(History, pk=object_id)
|
||||
|
||||
|
||||
try:
|
||||
Permission.objects.check_permissions(request.user, [PERMISSION_HISTORY_VIEW])
|
||||
except PermissionDenied:
|
||||
AccessEntry.objects.check_access(PERMISSION_HISTORY_VIEW, request.user, history.content_object)
|
||||
AccessEntry.objects.check_access(PERMISSION_HISTORY_VIEW, request.user, history.content_object)
|
||||
|
||||
form = HistoryDetailForm(instance=history, extra_fields=[
|
||||
{'label': _(u'Date'), 'field': lambda x: x.datetime.date()},
|
||||
@@ -99,7 +99,7 @@ def history_view(request, object_id):
|
||||
|
||||
def history_type_list(request, history_type_pk):
|
||||
history_type = get_object_or_404(HistoryType, pk=history_type_pk)
|
||||
|
||||
|
||||
return history_list(
|
||||
request,
|
||||
object_list=History.objects.filter(history_type=history_type),
|
||||
|
||||
Reference in New Issue
Block a user