general: update urls.py for django 1.11 (#20934)
This commit is contained in:
parent
884d749d6f
commit
ec0a214ff8
|
@ -14,20 +14,20 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from django.conf.urls import patterns, include, url
|
||||
from django.conf.urls import include, url
|
||||
from passerelle.urls_utils import decorated_includes, required, app_enabled
|
||||
from django.contrib.auth.decorators import login_required
|
||||
|
||||
from .views import *
|
||||
|
||||
public_urlpatterns = patterns('',
|
||||
public_urlpatterns = [
|
||||
url(r'^(?P<slug>[\w,-]+)/$', EncombrantsManagementDetailView.as_view(),
|
||||
name='montpellier-encombrants-view'),
|
||||
url(r'^(?P<slug>[\w,-]+)/available/(?P<insee>\d+)$', AvailableDaysView.as_view(),
|
||||
name='montpellier-encombrants-available-days'),
|
||||
)
|
||||
]
|
||||
|
||||
management_urlpatterns = patterns('',
|
||||
management_urlpatterns = [
|
||||
url(r'^add$', EncombrantsManagementCreateView.as_view(),
|
||||
name='montpellier-encombrants-add'),
|
||||
url(r'^(?P<slug>[\w,-]+)/edit$', EncombrantsManagementUpdateView.as_view(),
|
||||
|
@ -60,13 +60,12 @@ management_urlpatterns = patterns('',
|
|||
name='montpellier-encombrants-collectday-add'),
|
||||
url(r'^collectdays/(?P<pk>[\w,-]+)/delete$', CollectDayDeleteView.as_view(),
|
||||
name='montpellier-encombrants-collectday-remove'),
|
||||
)
|
||||
]
|
||||
|
||||
urlpatterns = required(
|
||||
app_enabled('passerelle_montpellier_encombrants'),
|
||||
patterns('',
|
||||
app_enabled('passerelle_montpellier_encombrants'), [
|
||||
url(r'^montpellier-encombrants/', include(public_urlpatterns)),
|
||||
url(r'^manage/montpellier-encombrants/',
|
||||
decorated_includes(login_required, include(management_urlpatterns))),
|
||||
)
|
||||
]
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue