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

Import and PEP8 cleanups

Browse Source
This commit is contained in:
Roberto Rosario
2012-07-26 22:42:36 -04:00
parent 24bf20b9d7
commit eecf7c7751
69 changed files with 173 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/linking/__init__.py
View File

@@ -1,19 +1,15 @@
from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from navigation.api import bind_links, register_sidebar_template, Link
from navigation.api import bind_links, register_sidebar_template
from project_setup.api import register_setup
from documents.permissions import PERMISSION_DOCUMENT_VIEW
from documents.models import Document
from acls.api import class_permissions
from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
from .models import SmartLink, SmartLinkCondition
from .permissions import (PERMISSION_SMART_LINK_VIEW,
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
PERMISSION_SMART_LINK_EDIT)
from .links import (smart_link_instance_view_link, smart_link_instances_for_document,
PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT)
from .links import (smart_link_instances_for_document,
smart_link_setup, smart_link_list, smart_link_create, smart_link_edit,
smart_link_delete, smart_link_condition_list, smart_link_condition_create,
smart_link_condition_edit, smart_link_condition_delete, smart_link_acl_list)

7
apps/linking/links.py
View File

@@ -4,11 +4,10 @@ from django.utils.translation import ugettext_lazy as _
from navigation.api import Link
from documents.permissions import PERMISSION_DOCUMENT_VIEW
from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
from acls.permissions import ACLS_VIEW_ACL
from .permissions import (PERMISSION_SMART_LINK_VIEW,
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
PERMISSION_SMART_LINK_EDIT)
from .permissions import (PERMISSION_SMART_LINK_CREATE,
PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT)
smart_link_instance_view_link = Link(text=_(u'smart links actions'), view='smart_link_instance_view', sprite='page_link', permissions=[PERMISSION_DOCUMENT_VIEW])
smart_link_instances_for_document = Link(text=_(u'smart links'), view='smart_link_instances_for_document', args='object.pk', sprite='page_link', permissions=[PERMISSION_DOCUMENT_VIEW])

2
apps/linking/views.py
View File

@@ -24,7 +24,7 @@ from .models import SmartLink, SmartLinkCondition
from .conf.settings import SHOW_EMPTY_SMART_LINKS
from .forms import (SmartLinkInstanceForm, SmartLinkForm,
SmartLinkConditionForm)
from . import smart_link_instance_view_link
from .links import smart_link_instance_view_link
from .permissions import (PERMISSION_SMART_LINK_VIEW,
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
PERMISSION_SMART_LINK_EDIT)