From be6f003732f86c7ed93031b1389fa0e53daebd3d Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 2 Dec 2013 13:09:42 +0100
Subject: [PATCH] re-enables trash/ in settings and urls so that
/trash/simple/ple.inria.f14 should work out of the box remember though that
this of course would break the packaged app b/c trash is not packaged
---
myslice/settings.py | 2 +-
myslice/urls.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/myslice/settings.py b/myslice/settings.py
index c51010a4..c069b96d 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -195,7 +195,7 @@ INSTALLED_APPS = (
# 'django.contrib.admindocs',
'portal',
# temporary - not packaged
- # 'trash',
+ 'trash',
'sample',
# DEPRECATED # 'django.contrib.formtools',
# DEPRECATED ## 'crispy_forms',
diff --git a/myslice/urls.py b/myslice/urls.py
index 8ff01f93..32109579 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -63,6 +63,6 @@ urlpatterns = patterns(
#
# various trash views - bound to go away
#
-# url(r'^trash/', include('trash.urls')),
+ url(r'^trash/', include('trash.urls')),
)
--
2.47.0