Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Adrián Ribao
Cartero
Commits
48acdc13
Commit
48acdc13
authored
Oct 03, 2017
by
Adrián Ribao
Browse files
remove patterns from url
parent
06c02b28
Pipeline
#1580
passed with stage
in 1 minute and 27 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
cartero/admin.py
View file @
48acdc13
# -*- coding: utf-8 -*-
from
django.conf.urls
import
patterns
from
django.contrib
import
admin
from
django.db.models
import
Count
from
django.utils.translation
import
ugettext_lazy
as
_
...
...
@@ -95,13 +94,13 @@ class EmailTemplateAdmin(admin.ModelAdmin):
def
get_urls
(
self
):
urls
=
super
(
EmailTemplateAdmin
,
self
).
get_urls
()
my_urls
=
patterns
(
my_urls
=
[
''
,
(
r
'^add/$'
,
self
.
admin_site
.
admin_view
(
CreateTemplateView
.
as_view
())),
(
r
'^(?P<pk>\d+)/change/$'
,
self
.
admin_site
.
admin_view
(
UpdateTemplateView
.
as_view
()))
)
]
return
my_urls
+
urls
...
...
cartero/urls.py
View file @
48acdc13
# -*- coding: utf-8 -*-
from
django.conf.urls
import
url
,
patterns
from
cartero.views
import
(
PreviewTemplate
,
SaveTemplateData
,
UnsubscribeView
,
GotoView
,
MailTrackView
)
from
django.conf.urls
import
url
from
cartero.views
import
(
PreviewTemplate
,
SaveTemplateData
,
UnsubscribeView
,
GotoView
,
MailTrackView
)
urlpatterns
=
patterns
(
''
,
urlpatterns
=
[
url
(
r
'^template-preview/(?P<pk>\d+)/$'
,
PreviewTemplate
.
as_view
(),
name
=
'preview_template'
),
...
...
@@ -24,4 +25,4 @@ urlpatterns = patterns(
url
(
r
'^track/(?P<mailtrack_id>.+)\.png$'
,
MailTrackView
.
as_view
(),
name
=
'track'
),
)
]
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment