Skip to content

Commit e7fcd06

Browse files
author
Mauricio Collazos
committed
merged
2 parents a43b6a7 + 1edde83 commit e7fcd06

File tree

10 files changed

+438
-19
lines changed

10 files changed

+438
-19
lines changed

django_crud_generator/django_crud_generator.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ def execute_from_command_line():
189189
parser.add_argument('--create_api', action='store_true', help="Create a api using Django Rest Framework")
190190

191191
parser.add_argument('--add_mixins', action='store_true', help="Add mixins to manage nested urls")
192+
193+
parser.add_argument('--slug', action='store_true', help="Use slug instad pk on urls")
192194

193195
args = vars(parser.parse_args())
194196

@@ -216,9 +218,13 @@ def execute_from_command_line():
216218

217219
modules_to_inject = [
218220
'conf',
219-
'urls',
220221
'forms'
221222
]
223+
224+
if args['slug']:
225+
modules_to_inject.append('urls_slug')
226+
else:
227+
modules_to_inject.append('urls')
222228

223229
if args['create_api']:
224230
modules_to_inject += [
@@ -227,10 +233,9 @@ def execute_from_command_line():
227233
'urls_api'
228234
]
229235

236+
# If mixins flag is present, we add mixins to the `modules to inject`
230237
if args['add_mixins']:
231-
modules_to_inject += [
232-
'mixins'
233-
]
238+
modules_to_inject.append('mixins')
234239

235240
for module in modules_to_inject:
236241
generic_insert_module(
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
from .views import ${view_file}
2+
3+
urlpatterns += [
4+
# ${view_file}
5+
url(
6+
'^${url_pattern}/$$',
7+
${view_file}.List.as_view(),
8+
name=conf.${model_prefix}_LIST_URL_NAME
9+
),
10+
url(
11+
'^${url_pattern}/create/$$',
12+
${view_file}.Create.as_view(),
13+
name=conf.${model_prefix}_CREATE_URL_NAME
14+
),
15+
url(
16+
'^${url_pattern}/(?P<slug>[\w-]+)/$$',
17+
${view_file}.Detail.as_view(),
18+
name=conf.${model_prefix}_DETAIL_URL_NAME
19+
),
20+
url(
21+
'^${url_pattern}/(?P<slug>[\w-]+)/update/$$',
22+
${view_file}.Update.as_view(),
23+
name=conf.${model_prefix}_UPDATE_URL_NAME
24+
),
25+
url(
26+
'^${url_pattern}/(?P<slug>[\w-]+)/delete/$$',
27+
${view_file}.Delete.as_view(),
28+
name=conf.${model_prefix}_DELETE_URL_NAME
29+
),
30+
]
31+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
from django.conf.urls import url
2+
3+
from . import conf
4+
5+
urlpatterns = [
6+
7+
]
8+

django_crud_generator/templates/view.py.tmpl

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
from django.core.urlresolvers import reverse_lazy
21
from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
3-
from django.core.urlresolvers import reverse_lazy
2+
try:
3+
from django.core.urlresolvers import reverse_lazy
4+
except ImportError:
5+
from django.urls import reverse_lazy
46
from django import http
57

68

@@ -47,9 +49,7 @@ class Create(LoginRequiredMixin, PermissionRequiredMixin, base_views.BaseCreateV
4749
super(Create, self).__init__()
4850

4951
def get_success_url(self):
50-
return reverse_lazy(conf.${model_prefix}_DETAIL_URL_NAME, kwargs={
51-
'pk': self.object.id
52-
})
52+
return reverse_lazy(conf.${model_prefix}_DETAIL_URL_NAME, kwargs=self.kwargs_for_reverse_url())
5353

5454

5555
class Detail(LoginRequiredMixin, base_views.BaseDetailView):
@@ -67,17 +67,13 @@ class Detail(LoginRequiredMixin, base_views.BaseDetailView):
6767
if self.request.user.has_perm("inventory.change_provider"):
6868
context['update_object_reversed_url'] = reverse_lazy(
6969
conf.${model_prefix}_UPDATE_URL_NAME,
70-
kwargs={
71-
'pk': self.get_object().id
72-
}
70+
kwargs=self.kwargs_for_reverse_url()
7371
)
7472

7573
if self.request.user.has_perm("inventory.delete_provider"):
7674
context['delete_object_reversed_url'] = reverse_lazy(
7775
conf.${model_prefix}_DELETE_URL_NAME,
78-
kwargs={
79-
'pk': self.get_object().id
80-
}
76+
kwargs=self.kwargs_for_reverse_url()
8177
)
8278

8379
return context
@@ -97,9 +93,7 @@ class Update(LoginRequiredMixin, PermissionRequiredMixin, base_views.BaseUpdateV
9793
super(Update, self).__init__()
9894

9995
def get_success_url(self):
100-
return reverse_lazy(conf.${model_prefix}_DETAIL_URL_NAME, kwargs={
101-
'pk': self.object.id
102-
})
96+
return reverse_lazy(conf.${model_prefix}_DETAIL_URL_NAME, kwargs=self.kwargs_for_reverse_url())
10397

10498

10599
class Delete(LoginRequiredMixin, PermissionRequiredMixin, base_views.BaseDeleteView):

docs/Makefile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line.
5+
SPHINXOPTS =
6+
SPHINXBUILD = sphinx-build
7+
SOURCEDIR = source
8+
BUILDDIR = build
9+
10+
# Put it first so that "make" without argument is like "make help".
11+
help:
12+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
13+
14+
.PHONY: help Makefile
15+
16+
# Catch-all target: route all unknown targets to Sphinx using the new
17+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
18+
%: Makefile
19+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/source/conf.py

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
# -*- coding: utf-8 -*-
2+
#
3+
# Configuration file for the Sphinx documentation builder.
4+
#
5+
# This file does only contain a selection of the most common options. For a
6+
# full list see the documentation:
7+
# http://www.sphinx-doc.org/en/master/config
8+
9+
# -- Path setup --------------------------------------------------------------
10+
11+
# If extensions (or modules to document with autodoc) are in another directory,
12+
# add these directories to sys.path here. If the directory is relative to the
13+
# documentation root, use os.path.abspath to make it absolute, like shown here.
14+
#
15+
# import os
16+
# import sys
17+
# sys.path.insert(0, os.path.abspath('.'))
18+
19+
20+
# -- Project information -----------------------------------------------------
21+
22+
project = u'Django Crud Generator'
23+
copyright = u'2018, contraslash S.A.S.'
24+
author = u'contraslash S.A.S.'
25+
26+
# The short X.Y version
27+
version = u''
28+
# The full version, including alpha/beta/rc tags
29+
release = u'0.3.1'
30+
31+
32+
# -- General configuration ---------------------------------------------------
33+
34+
# If your documentation needs a minimal Sphinx version, state it here.
35+
#
36+
# needs_sphinx = '1.0'
37+
38+
# Add any Sphinx extension module names here, as strings. They can be
39+
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
40+
# ones.
41+
extensions = [
42+
]
43+
44+
# Add any paths that contain templates here, relative to this directory.
45+
templates_path = ['_templates']
46+
47+
# The suffix(es) of source filenames.
48+
# You can specify multiple suffix as a list of string:
49+
from recommonmark.parser import CommonMarkParser
50+
51+
source_parsers = {
52+
'.md': CommonMarkParser,
53+
}
54+
55+
source_suffix = ['.rst', '.md']
56+
# source_suffix = '.rst'
57+
58+
# The master toctree document.
59+
master_doc = 'index'
60+
61+
# The language for content autogenerated by Sphinx. Refer to documentation
62+
# for a list of supported languages.
63+
#
64+
# This is also used if you do content translation via gettext catalogs.
65+
# Usually you set "language" from the command line for these cases.
66+
language = None
67+
68+
# List of patterns, relative to source directory, that match files and
69+
# directories to ignore when looking for source files.
70+
# This pattern also affects html_static_path and html_extra_path.
71+
exclude_patterns = []
72+
73+
# The name of the Pygments (syntax highlighting) style to use.
74+
pygments_style = None
75+
76+
77+
# -- Options for HTML output -------------------------------------------------
78+
79+
# The theme to use for HTML and HTML Help pages. See the documentation for
80+
# a list of builtin themes.
81+
#
82+
html_theme = 'sphinx_rtd_theme'
83+
84+
# Theme options are theme-specific and customize the look and feel of a theme
85+
# further. For a list of options available for each theme, see the
86+
# documentation.
87+
#
88+
# html_theme_options = {}
89+
90+
# Add any paths that contain custom static files (such as style sheets) here,
91+
# relative to this directory. They are copied after the builtin static files,
92+
# so a file named "default.css" will overwrite the builtin "default.css".
93+
html_static_path = ['_static']
94+
95+
# Custom sidebar templates, must be a dictionary that maps document names
96+
# to template names.
97+
#
98+
# The default sidebars (for documents that don't match any pattern) are
99+
# defined by theme itself. Builtin themes are using these templates by
100+
# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
101+
# 'searchbox.html']``.
102+
#
103+
# html_sidebars = {}
104+
105+
106+
# -- Options for HTMLHelp output ---------------------------------------------
107+
108+
# Output file base name for HTML help builder.
109+
htmlhelp_basename = 'DjangoCrudGeneratordoc'
110+
111+
112+
# -- Options for LaTeX output ------------------------------------------------
113+
114+
latex_elements = {
115+
# The paper size ('letterpaper' or 'a4paper').
116+
#
117+
# 'papersize': 'letterpaper',
118+
119+
# The font size ('10pt', '11pt' or '12pt').
120+
#
121+
# 'pointsize': '10pt',
122+
123+
# Additional stuff for the LaTeX preamble.
124+
#
125+
# 'preamble': '',
126+
127+
# Latex figure (float) alignment
128+
#
129+
# 'figure_align': 'htbp',
130+
}
131+
132+
# Grouping the document tree into LaTeX files. List of tuples
133+
# (source start file, target name, title,
134+
# author, documentclass [howto, manual, or own class]).
135+
latex_documents = [
136+
(master_doc, 'DjangoCrudGenerator.tex', u'Django Crud Generator Documentation',
137+
u'contraslash S.A.S.', 'manual'),
138+
]
139+
140+
141+
# -- Options for manual page output ------------------------------------------
142+
143+
# One entry per manual page. List of tuples
144+
# (source start file, name, description, authors, manual section).
145+
man_pages = [
146+
(master_doc, 'djangocrudgenerator', u'Django Crud Generator Documentation',
147+
[author], 1)
148+
]
149+
150+
151+
# -- Options for Texinfo output ----------------------------------------------
152+
153+
# Grouping the document tree into Texinfo files. List of tuples
154+
# (source start file, target name, title, author,
155+
# dir menu entry, description, category)
156+
texinfo_documents = [
157+
(master_doc, 'DjangoCrudGenerator', u'Django Crud Generator Documentation',
158+
author, 'DjangoCrudGenerator', 'One line description of project.',
159+
'Miscellaneous'),
160+
]
161+
162+
163+
# -- Options for Epub output -------------------------------------------------
164+
165+
# Bibliographic Dublin Core info.
166+
epub_title = project
167+
168+
# The unique identifier of the text. This can be a ISBN number
169+
# or the project homepage.
170+
#
171+
# epub_identifier = ''
172+
173+
# A unique identification for the text.
174+
#
175+
# epub_uid = ''
176+
177+
# A list of files that should not be packed into the epub file.
178+
epub_exclude_files = ['search.html']

0 commit comments

Comments
 (0)