Projet

Général

Profil

0002-misc-simplify-urls.patch

Lauréline Guérin, 07 juin 2022 10:46

Télécharger (9,79 ko)

Voir les différences:

Subject: [PATCH 2/2] misc: simplify urls

urls are already decorated in lingo.urls includes
 lingo/pricing/urls.py | 89 +++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 46 deletions(-)
lingo/pricing/urls.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.conf.urls import url
18
from django.contrib.admin.views.decorators import staff_member_required
19 18

  
20 19
from . import views
21 20

  
22 21
urlpatterns = [
23
    url(r'^$', staff_member_required(views.pricing_list), name='lingo-manager-pricing-list'),
24
    url(r'^import/$', staff_member_required(views.config_import), name='lingo-manager-pricing-config-import'),
25
    url(r'^export/$', staff_member_required(views.config_export), name='lingo-manager-pricing-config-export'),
22
    url(r'^$', views.pricing_list, name='lingo-manager-pricing-list'),
23
    url(r'^import/$', views.config_import, name='lingo-manager-pricing-config-import'),
24
    url(r'^export/$', views.config_export, name='lingo-manager-pricing-config-export'),
26 25
    url(
27 26
        r'^add/$',
28
        staff_member_required(views.pricing_add),
27
        views.pricing_add,
29 28
        name='lingo-manager-pricing-add',
30 29
    ),
31 30
    url(
32 31
        r'^(?P<pk>\d+)/$',
33
        staff_member_required(views.pricing_detail),
32
        views.pricing_detail,
34 33
        name='lingo-manager-pricing-detail',
35 34
    ),
36 35
    url(
37 36
        r'^(?P<pk>\d+)/edit/$',
38
        staff_member_required(views.pricing_edit),
37
        views.pricing_edit,
39 38
        name='lingo-manager-pricing-edit',
40 39
    ),
41 40
    url(
42 41
        r'^(?P<pk>\d+)/delete/$',
43
        staff_member_required(views.pricing_delete),
42
        views.pricing_delete,
44 43
        name='lingo-manager-pricing-delete',
45 44
    ),
46 45
    url(
47 46
        r'^(?P<pk>\d+)/duplicate/$',
48
        staff_member_required(views.pricing_duplicate),
47
        views.pricing_duplicate,
49 48
        name='lingo-manager-pricing-duplicate',
50 49
    ),
51 50
    url(
52 51
        r'^(?P<pk>\d+)/export/$',
53
        staff_member_required(views.pricing_export),
52
        views.pricing_export,
54 53
        name='lingo-manager-pricing-export',
55 54
    ),
56 55
    url(
57 56
        r'^(?P<pk>\d+)/variable/$',
58
        staff_member_required(views.pricing_variable_edit),
57
        views.pricing_variable_edit,
59 58
        name='lingo-manager-pricing-variable-edit',
60 59
    ),
61 60
    url(
62 61
        r'^(?P<pk>\d+)/category/add/$',
63
        staff_member_required(views.pricing_criteria_category_add),
62
        views.pricing_criteria_category_add,
64 63
        name='lingo-manager-pricing-criteria-category-add',
65 64
    ),
66 65
    url(
67 66
        r'^(?P<pk>\d+)/category/(?P<category_pk>\d+)/edit/$',
68
        staff_member_required(views.pricing_criteria_category_edit),
67
        views.pricing_criteria_category_edit,
69 68
        name='lingo-manager-pricing-criteria-category-edit',
70 69
    ),
71 70
    url(
72 71
        r'^(?P<pk>\d+)/category/(?P<category_pk>\d+)/delete/$',
73
        staff_member_required(views.pricing_criteria_category_delete),
72
        views.pricing_criteria_category_delete,
74 73
        name='lingo-manager-pricing-criteria-category-delete',
75 74
    ),
76 75
    url(
77 76
        r'^(?P<pk>\d+)/order/$',
78
        staff_member_required(views.pricing_criteria_category_order),
77
        views.pricing_criteria_category_order,
79 78
        name='lingo-manager-pricing-criteria-category-order',
80 79
    ),
81 80
    url(
82 81
        r'^criterias/$',
83
        staff_member_required(views.criteria_list),
82
        views.criteria_list,
84 83
        name='lingo-manager-pricing-criteria-list',
85 84
    ),
86 85
    url(
87 86
        r'^criteria/category/add/$',
88
        staff_member_required(views.criteria_category_add),
87
        views.criteria_category_add,
89 88
        name='lingo-manager-pricing-criteria-category-add',
90 89
    ),
91 90
    url(
92 91
        r'^criteria/category/(?P<pk>\d+)/edit/$',
93
        staff_member_required(views.criteria_category_edit),
92
        views.criteria_category_edit,
94 93
        name='lingo-manager-pricing-criteria-category-edit',
95 94
    ),
96 95
    url(
97 96
        r'^criteria/category/(?P<pk>\d+)/delete/$',
98
        staff_member_required(views.criteria_category_delete),
97
        views.criteria_category_delete,
99 98
        name='lingo-manager-pricing-criteria-category-delete',
100 99
    ),
101 100
    url(
102 101
        r'^criteria/category/(?P<pk>\d+)/export/$',
103
        staff_member_required(views.criteria_category_export),
102
        views.criteria_category_export,
104 103
        name='lingo-manager-pricing-criteria-category-export',
105 104
    ),
106 105
    url(
107 106
        r'^criteria/category/(?P<pk>\d+)/order/$',
108
        staff_member_required(views.criteria_order),
107
        views.criteria_order,
109 108
        name='lingo-manager-pricing-criteria-order',
110 109
    ),
111 110
    url(
112 111
        r'^criteria/category/(?P<category_pk>\d+)/add/$',
113
        staff_member_required(views.criteria_add),
112
        views.criteria_add,
114 113
        name='lingo-manager-pricing-criteria-add',
115 114
    ),
116 115
    url(
117 116
        r'^criteria/category/(?P<category_pk>\d+)/(?P<pk>\d+)/edit/$',
118
        staff_member_required(views.criteria_edit),
117
        views.criteria_edit,
119 118
        name='lingo-manager-pricing-criteria-edit',
120 119
    ),
121 120
    url(
122 121
        r'^criteria/category/(?P<category_pk>\d+)/(?P<pk>\d+)/delete/$',
123
        staff_member_required(views.criteria_delete),
122
        views.criteria_delete,
124 123
        name='lingo-manager-pricing-criteria-delete',
125 124
    ),
126 125
    url(
127 126
        r'^agendas/sync/$',
128
        staff_member_required(views.agenda_sync),
127
        views.agenda_sync,
129 128
        name='lingo-manager-agenda-sync',
130 129
    ),
131 130
    url(
132 131
        r'^agendas/$',
133
        staff_member_required(views.agenda_list),
132
        views.agenda_list,
134 133
        name='lingo-manager-agenda-list',
135 134
    ),
136 135
    url(
137 136
        r'^agenda/(?P<pk>\d+)/$',
138
        staff_member_required(views.agenda_detail),
137
        views.agenda_detail,
139 138
        name='lingo-manager-agenda-detail',
140 139
    ),
141 140
    url(
142 141
        r'^agenda/((?P<slug>[-_a-zA-Z0-9]+))/$',
143
        staff_member_required(views.agenda_detail_redirect),
142
        views.agenda_detail_redirect,
144 143
        name='lingo-manager-agenda-detail-redirect',
145 144
    ),
146 145
    url(
147 146
        r'^agenda/(?P<pk>\d+)/export/$',
148
        staff_member_required(views.agenda_export),
147
        views.agenda_export,
149 148
        name='lingo-manager-agenda-export',
150 149
    ),
151 150
    url(
152 151
        r'^agenda/(?P<pk>\d+)/check-options/$',
153
        staff_member_required(views.agenda_booking_check_settings),
152
        views.agenda_booking_check_settings,
154 153
        name='lingo-manager-agenda-booking-check-settings',
155 154
    ),
156 155
    url(
157 156
        r'^agenda/(?P<pk>\d+)/pricing/add/$',
158
        staff_member_required(views.agenda_pricing_add),
157
        views.agenda_pricing_add,
159 158
        name='lingo-manager-agenda-pricing-add',
160 159
    ),
161 160
    url(
162 161
        r'^agenda/(?P<pk>\d+)/pricing/(?P<pricing_pk>\d+)/$',
163
        staff_member_required(views.agenda_pricing_detail),
162
        views.agenda_pricing_detail,
164 163
        name='lingo-manager-agenda-pricing-detail',
165 164
    ),
166 165
    url(
167 166
        r'^agenda/(?P<pk>\d+)/pricing/(?P<pricing_pk>\d+)/edit/$',
168
        staff_member_required(views.agenda_pricing_edit),
167
        views.agenda_pricing_edit,
169 168
        name='lingo-manager-agenda-pricing-edit',
170 169
    ),
171 170
    url(
172 171
        r'^agenda/(?P<pk>\d+)/pricing/(?P<pricing_pk>\d+)/delete/$',
173
        staff_member_required(views.agenda_pricing_delete),
172
        views.agenda_pricing_delete,
174 173
        name='lingo-manager-agenda-pricing-delete',
175 174
    ),
176 175
    url(
177 176
        r'^agenda/(?P<pk>\d+)/pricing/(?P<pricing_pk>\d+)/matrix/edit/$',
178
        staff_member_required(views.agenda_pricing_matrix_edit),
177
        views.agenda_pricing_matrix_edit,
179 178
        name='lingo-manager-agenda-pricing-matrix-edit',
180 179
    ),
181 180
    url(
182 181
        r'^agenda/(?P<pk>\d+)/pricing/(?P<pricing_pk>\d+)/matrix/(?P<slug>[-_a-zA-Z0-9]+)/edit/$',
183
        staff_member_required(views.agenda_pricing_matrix_edit),
182
        views.agenda_pricing_matrix_edit,
184 183
        name='lingo-manager-agenda-pricing-matrix-slug-edit',
185 184
    ),
186
    url(
187
        r'^check-types/$', staff_member_required(views.check_type_list), name='lingo-manager-check-type-list'
188
    ),
185
    url(r'^check-types/$', views.check_type_list, name='lingo-manager-check-type-list'),
189 186
    url(
190 187
        r'^check-type/group/add/$',
191
        staff_member_required(views.check_type_group_add),
188
        views.check_type_group_add,
192 189
        name='lingo-manager-check-type-group-add',
193 190
    ),
194 191
    url(
195 192
        r'^check-type/group/(?P<pk>\d+)/edit/$',
196
        staff_member_required(views.check_type_group_edit),
193
        views.check_type_group_edit,
197 194
        name='lingo-manager-check-type-group-edit',
198 195
    ),
199 196
    url(
200 197
        r'^check-type/group/(?P<pk>\d+)/delete/$',
201
        staff_member_required(views.check_type_group_delete),
198
        views.check_type_group_delete,
202 199
        name='lingo-manager-check-type-group-delete',
203 200
    ),
204 201
    url(
205 202
        r'^check-type/group/(?P<pk>\d+)/export/$',
206
        staff_member_required(views.check_type_group_export),
203
        views.check_type_group_export,
207 204
        name='lingo-manager-check-type-group-export',
208 205
    ),
209 206
    url(
210 207
        r'^check-type/group/(?P<group_pk>\d+)/add/$',
211
        staff_member_required(views.check_type_add),
208
        views.check_type_add,
212 209
        name='lingo-manager-check-type-add',
213 210
    ),
214 211
    url(
215 212
        r'^check-type/group/(?P<group_pk>\d+)/(?P<pk>\d+)/edit/$',
216
        staff_member_required(views.check_type_edit),
213
        views.check_type_edit,
217 214
        name='lingo-manager-check-type-edit',
218 215
    ),
219 216
    url(
220 217
        r'^check-type/group/(?P<group_pk>\d+)/(?P<pk>\d+)/delete/$',
221
        staff_member_required(views.check_type_delete),
218
        views.check_type_delete,
222 219
        name='lingo-manager-check-type-delete',
223 220
    ),
224 221
]
225
-