changeset 904:46263060782e storage-ng

remove references to "trash" (is an implementation detail and might change)
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 30 Sep 2011 15:53:00 +0200
parents 50aa61c9b952
children 51475954290f
files MoinMoin/apps/misc/views.py MoinMoin/config/default.py MoinMoin/items/__init__.py MoinMoin/storage/middleware/indexing.py
diffstat 4 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/misc/views.py	Fri Sep 30 01:00:08 2011 +0200
+++ b/MoinMoin/apps/misc/views.py	Fri Sep 30 15:53:00 2011 +0200
@@ -63,7 +63,7 @@
     can implement SisterWiki functionality easily.
     See: http://usemod.com/cgi-bin/mb.pl?SisterSitesImplementationGuide
     """
-    # XXX we currently also get trash items, fix this
+    # XXX we currently also get deleted items, fix this
     item_names = sorted([rev.meta[NAME] for rev in flaskg.storage.documents(all_revs=False, wikiname=app.cfg.interwikiname)])
     content = render_template('misc/urls_names.txt', item_names=item_names)
     return Response(content, mimetype='text/plain')
--- a/MoinMoin/config/default.py	Fri Sep 30 01:00:08 2011 +0200
+++ b/MoinMoin/config/default.py	Fri Sep 30 15:53:00 2011 +0200
@@ -374,7 +374,7 @@
         ('frontend.subscribe_item', None, L_('Switch notifications about item changes on or off'), True, ),
         ('frontend.copy_item', L_('Copy'), L_('Create a copy of this item'), True, ),
         ('frontend.rename_item', L_('Rename'), L_('Rename this item'), True, ),
-        ('frontend.delete_item', L_('Delete'), L_('Move this item to the trash'), True, ),
+        ('frontend.delete_item', L_('Delete'), L_('Delete this item'), True, ),
         ('frontend.destroy_item', L_('Destroy'), L_('Completely destroy this item'), True, ),
         ('frontend.backrefs', L_('Referrers'), L_('What refers here?'), False, ),
         ('frontend.sitemap', L_('Site Map'), L_('Local Site Map of this item'), True, ),
@@ -541,7 +541,6 @@
       ('content', '/', "All content is by default stored below /, hence the prefix is ''."),  # Not really necessary. Just for completeness.
       ('user_profile', 'UserProfile/', 'User profiles (i.e. user data, not their homepage) are stored in this namespace.'),
       ('user_homepage', 'User/', 'All user homepages are stored below this namespace.'),
-      ('trash', 'Trash/', 'This is the namespace in which an item ends up when it is deleted.')
     )),
 
     'user': ('Users / User settings', None, (
--- a/MoinMoin/items/__init__.py	Fri Sep 30 01:00:08 2011 +0200
+++ b/MoinMoin/items/__init__.py	Fri Sep 30 15:53:00 2011 +0200
@@ -397,7 +397,7 @@
 
     def delete(self, comment=u''):
         """
-        delete this item by moving it to the trashbin
+        delete this item
         """
         trash_prefix = u'Trash/' # XXX move to config
         now = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime())
--- a/MoinMoin/storage/middleware/indexing.py	Fri Sep 30 01:00:08 2011 +0200
+++ b/MoinMoin/storage/middleware/indexing.py	Fri Sep 30 15:53:00 2011 +0200
@@ -514,7 +514,7 @@
         """
         Optimize backend / collect garbage to safe space:
 
-        * trash bin: empty it? use trash_max_age?
+        * deleted items: destroy them? use a deleted_max_age?
         * user profiles: only keep latest revision?
         * normal wiki items: keep by max_revisions_count / max_age
         * deduplicate data (determine dataids with same hash, fix references to point to one of them)