From 1a949719eb87a9b12c9922734eb01fd064d1ef6b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 14 Sep 2012 02:25:58 -0400 Subject: [PATCH] Update and enable the trash app --- apps/icons/iconsets/fat_cow.py | 3 +++ apps/icons/literals.py | 3 +++ apps/trash/__init__.py | 2 -- apps/trash/api.py | 2 +- apps/trash/icons.py | 9 +++++++++ apps/trash/links.py | 10 ++++++---- apps/trash/registry.py | 12 ++++++++++++ settings.py | 2 +- urls.py | 2 +- 9 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 apps/trash/icons.py create mode 100644 apps/trash/registry.py diff --git a/apps/icons/iconsets/fat_cow.py b/apps/icons/iconsets/fat_cow.py index 0ecd68ddbc..812e301df9 100644 --- a/apps/icons/iconsets/fat_cow.py +++ b/apps/icons/iconsets/fat_cow.py @@ -11,6 +11,9 @@ class IconSet(IconSetBase): dictionary={ ADD: 'add.png', APPLICATION_VIEW_ICONS: 'application_view_icons.png', + BIN_CLOSED: 'bin_closed.png', + BIN: 'bin.png', + BIN_EMPTY: 'bin_empty.png', BLACKBOARD_SUM: 'blackboard_sum.png', BOOK: 'book.png', BOOK_GO: 'book_go.png', diff --git a/apps/icons/literals.py b/apps/icons/literals.py index 2b33e35e76..050c38d3d7 100644 --- a/apps/icons/literals.py +++ b/apps/icons/literals.py @@ -5,6 +5,9 @@ DEFAULT_ICON_SET = 'fat_cow' ADD = 'add' APPLICATION_VIEW_ICONS = 'application_view_icons' +BIN_CLOSED = 'bin_closed' +BIN = 'bin' +BIN_EMPTY = 'bin_empty' BLACKBOARD_SUM = 'blackboard_sum' BOOK = 'book' BOOK_GO = 'book_go' diff --git a/apps/trash/__init__.py b/apps/trash/__init__.py index 50e1e7dda9..6a9fb6946f 100644 --- a/apps/trash/__init__.py +++ b/apps/trash/__init__.py @@ -6,14 +6,12 @@ from django.db import transaction, DatabaseError from documents.models import Document from folders.models import Folder from navigation.api import bind_links -from project_tools.api import register_tool from taggit.models import Tag from .api import make_trashable from .links import trash_can_list, trash_can_items, trash_can_item_restore, trash_can_item_delete from .models import TrashCan, TrashCanItem -register_tool(trash_can_list) bind_links(['trash_can_list', TrashCan], trash_can_list, menu_name='secondary_menu') bind_links([TrashCan], trash_can_items) bind_links([TrashCanItem], [trash_can_item_restore, trash_can_item_delete]) diff --git a/apps/trash/api.py b/apps/trash/api.py index aae3e6044d..0c2ffe182a 100644 --- a/apps/trash/api.py +++ b/apps/trash/api.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from common.querysets import CustomizableQuerySet +from common.querysets import CustomizableQuerySet from .models import new_delete_method, TrashableQuerySetManager diff --git a/apps/trash/icons.py b/apps/trash/icons.py new file mode 100644 index 0000000000..4f0da24e70 --- /dev/null +++ b/apps/trash/icons.py @@ -0,0 +1,9 @@ +from __future__ import absolute_import + +from icons.literals import BIN_CLOSED, BIN, BIN_EMPTY, DELETE +from icons import Icon + +icon_trash_cans = Icon(BIN_CLOSED) +icon_trash_can_items = Icon(BIN) +icon_trash_can_item_restore = Icon(BIN_EMPTY) +icon_trash_can_item_delete = Icon(DELETE) diff --git a/apps/trash/links.py b/apps/trash/links.py index 109bb069cc..1452ca69c0 100644 --- a/apps/trash/links.py +++ b/apps/trash/links.py @@ -4,8 +4,10 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import Link +from .icons import (icon_trash_cans, icon_trash_can_items, icon_trash_can_item_restore, + icon_trash_can_item_delete) -trash_can_list = Link(text=_(u'trash cans'), view='trash_can_list', sprite='bin_closed', icon='bin_closed.png') -trash_can_items = Link(text=_(u'items'), view='trash_can_items', args='trash_can.pk', sprite='bin') -trash_can_item_restore = Link(text=_(u'restore'), view='trash_can_item_restore', args='trash_can_item.pk', sprite='bin_empty') -trash_can_item_delete = Link(text=_(u'delete'), view='trash_can_item_delete', args='trash_can_item.pk', sprite='delete') +trash_can_list = Link(text=_(u'trash cans'), view='trash_can_list', icon=icon_trash_cans) +trash_can_items = Link(text=_(u'items'), view='trash_can_items', args='trash_can.pk', icon=icon_trash_can_items) +trash_can_item_restore = Link(text=_(u'restore'), view='trash_can_item_restore', args='trash_can_item.pk', icon=icon_trash_can_item_restore) +trash_can_item_delete = Link(text=_(u'delete'), view='trash_can_item_delete', args='trash_can_item.pk', icon=icon_trash_can_item_delete) diff --git a/apps/trash/registry.py b/apps/trash/registry.py new file mode 100644 index 0000000000..4af898d78d --- /dev/null +++ b/apps/trash/registry.py @@ -0,0 +1,12 @@ +from __future__ import absolute_import + +from django.utils.translation import ugettext_lazy as _ + +from .icons import icon_trash_cans +from .links import trash_can_list + +label = _(u'Trash manager') +description = _(u'Provides a generic and reusable trash can.') +icon = icon_trash_cans +dependencies = ['app_registry', 'icons', 'documents', 'permissions', 'navigation', 'documents', 'tags', 'folders'] +tool_links = [trash_can_list] diff --git a/settings.py b/settings.py index 0c67f1078e..32193487ad 100644 --- a/settings.py +++ b/settings.py @@ -161,7 +161,6 @@ INSTALLED_APPS = ( 'pagination', 'django_gpg', 'converter', - #'trash', 'user_management', 'mimetype', 'clustering', @@ -192,6 +191,7 @@ INSTALLED_APPS = ( 'rest_api', #'bootstrap', 'statistics', + 'trash', # Has to be last so the other apps can register it's signals #'signaler', diff --git a/urls.py b/urls.py index 948c4c4e69..34faa6cfec 100644 --- a/urls.py +++ b/urls.py @@ -41,7 +41,7 @@ urlpatterns = patterns('', (r'^maintenance/', include('maintenance.urls')), (r'^statistics/', include('statistics.urls')), (r'^clustering/', include('clustering.urls')), - #(r'^trash/', include('trash.urls')), + (r'^trash/', include('trash.urls')), #(r'^admin/doc/', include('django.contrib.admindocs.urls')), #(r'^admin/', include(admin.site.urls)), )