##// END OF EJS Templates
radarsys
RSS
Task #784: Permisos de usuarios, staff_member_required se cambio por user_passes_test...
Fiorella Quino -
r214:bba41f25352a
parent child
Show More
Show file before | Show file after | Hide comments
@@ -35,9 +35,11 from apps.rc.models import RCConfiguration, RCLine, RCLineType
35 from apps.dds.models import DDSConfiguration
35 from apps.dds.models import DDSConfiguration
36
36
37 from django.contrib.auth.decorators import login_required
37 from django.contrib.auth.decorators import login_required
38 from django.contrib.auth.decorators import user_passes_test
38 from django.contrib.admin.views.decorators import staff_member_required
39 from django.contrib.admin.views.decorators import staff_member_required
39
40
40
41
42
41 CONF_FORMS = {
43 CONF_FORMS = {
42 'rc': RCConfigurationForm,
44 'rc': RCConfigurationForm,
43 'dds': DDSConfigurationForm,
45 'dds': DDSConfigurationForm,
@@ -104,8 +106,7 def location(request, id_loc):
104 return render(request, 'location.html', kwargs)
106 return render(request, 'location.html', kwargs)
105
107
106
108
107 from django.contrib.auth.decorators import user_passes_test
109 @user_passes_test(lambda u:u.is_staff)
108 @user_passes_test(lambda u:u.is_staff, login_url='accounts:login')
109 def location_new(request):
110 def location_new(request):
110
111
111 if request.method == 'GET':
112 if request.method == 'GET':
@@ -127,7 +128,7 def location_new(request):
127 return render(request, 'base_edit.html', kwargs)
128 return render(request, 'base_edit.html', kwargs)
128
129
129
130
130 @staff_member_required(login_url='/accounts/login/')
131 @user_passes_test(lambda u:u.is_staff)
131 def location_edit(request, id_loc):
132 def location_edit(request, id_loc):
132
133
133 location = get_object_or_404(Location, pk=id_loc)
134 location = get_object_or_404(Location, pk=id_loc)
@@ -151,7 +152,7 def location_edit(request, id_loc):
151 return render(request, 'base_edit.html', kwargs)
152 return render(request, 'base_edit.html', kwargs)
152
153
153
154
154 @staff_member_required(login_url='/accounts/login/')
155 @user_passes_test(lambda u:u.is_staff)
155 def location_delete(request, id_loc):
156 def location_delete(request, id_loc):
156
157
157 location = get_object_or_404(Location, pk=id_loc)
158 location = get_object_or_404(Location, pk=id_loc)
@@ -204,7 +205,7 def device(request, id_dev):
204 return render(request, 'device.html', kwargs)
205 return render(request, 'device.html', kwargs)
205
206
206
207
207 @staff_member_required(login_url='/accounts/login/')
208 @user_passes_test(lambda u:u.is_staff)
208 def device_new(request):
209 def device_new(request):
209
210
210 if request.method == 'GET':
211 if request.method == 'GET':
@@ -226,7 +227,7 def device_new(request):
226 return render(request, 'base_edit.html', kwargs)
227 return render(request, 'base_edit.html', kwargs)
227
228
228
229
229 @staff_member_required(login_url='/accounts/login/')
230 @user_passes_test(lambda u:u.is_staff)
230 def device_edit(request, id_dev):
231 def device_edit(request, id_dev):
231
232
232 device = get_object_or_404(Device, pk=id_dev)
233 device = get_object_or_404(Device, pk=id_dev)
@@ -250,7 +251,7 def device_edit(request, id_dev):
250 return render(request, 'base_edit.html', kwargs)
251 return render(request, 'base_edit.html', kwargs)
251
252
252
253
253 @staff_member_required(login_url='/accounts/login/')
254 @user_passes_test(lambda u:u.is_staff)
254 def device_delete(request, id_dev):
255 def device_delete(request, id_dev):
255
256
256 device = get_object_or_404(Device, pk=id_dev)
257 device = get_object_or_404(Device, pk=id_dev)
@@ -318,7 +319,7 def campaign(request, id_camp):
318 return render(request, 'campaign.html', kwargs)
319 return render(request, 'campaign.html', kwargs)
319
320
320
321
321 @staff_member_required(login_url='/accounts/login/')
322 @user_passes_test(lambda u:u.is_staff)
322 def campaign_new(request):
323 def campaign_new(request):
323
324
324 kwargs = {}
325 kwargs = {}
@@ -371,7 +372,7 def campaign_new(request):
371 return render(request, 'campaign_edit.html', kwargs)
372 return render(request, 'campaign_edit.html', kwargs)
372
373
373
374
374 @staff_member_required(login_url='/accounts/login/')
375 @user_passes_test(lambda u:u.is_staff)
375 def campaign_edit(request, id_camp):
376 def campaign_edit(request, id_camp):
376
377
377 campaign = get_object_or_404(Campaign, pk=id_camp)
378 campaign = get_object_or_404(Campaign, pk=id_camp)
@@ -412,7 +413,7 def campaign_edit(request, id_camp):
412 return render(request, 'campaign_edit.html', kwargs)
413 return render(request, 'campaign_edit.html', kwargs)
413
414
414
415
415 @staff_member_required(login_url='/accounts/login/')
416 @user_passes_test(lambda u:u.is_staff)
416 def campaign_delete(request, id_camp):
417 def campaign_delete(request, id_camp):
417
418
418 campaign = get_object_or_404(Campaign, pk=id_camp)
419 campaign = get_object_or_404(Campaign, pk=id_camp)
@@ -442,7 +443,7 def campaign_delete(request, id_camp):
442 return render(request, 'confirm.html', kwargs)
443 return render(request, 'confirm.html', kwargs)
443
444
444
445
445 @staff_member_required(login_url='/accounts/login/')
446 @user_passes_test(lambda u:u.is_staff)
446 def campaign_export(request, id_camp):
447 def campaign_export(request, id_camp):
447
448
448 campaign = get_object_or_404(Campaign, pk=id_camp)
449 campaign = get_object_or_404(Campaign, pk=id_camp)
@@ -457,7 +458,7 def campaign_export(request, id_camp):
457 return response
458 return response
458
459
459
460
460 @staff_member_required(login_url='/accounts/login/')
461 @user_passes_test(lambda u:u.is_staff)
461 def campaign_import(request, id_camp):
462 def campaign_import(request, id_camp):
462
463
463 campaign = get_object_or_404(Campaign, pk=id_camp)
464 campaign = get_object_or_404(Campaign, pk=id_camp)
@@ -538,7 +539,7 def experiment(request, id_exp):
538 return render(request, 'experiment.html', kwargs)
539 return render(request, 'experiment.html', kwargs)
539
540
540
541
541 @staff_member_required(login_url='/accounts/login/')
542 @user_passes_test(lambda u:u.is_staff)
542 def experiment_new(request, id_camp=None):
543 def experiment_new(request, id_camp=None):
543
544
544 kwargs = {}
545 kwargs = {}
@@ -581,7 +582,7 def experiment_new(request, id_camp=None):
581 return render(request, 'experiment_edit.html', kwargs)
582 return render(request, 'experiment_edit.html', kwargs)
582
583
583
584
584 @staff_member_required(login_url='/accounts/login/')
585 @user_passes_test(lambda u:u.is_staff)
585 def experiment_edit(request, id_exp):
586 def experiment_edit(request, id_exp):
586
587
587 experiment = get_object_or_404(Experiment, pk=id_exp)
588 experiment = get_object_or_404(Experiment, pk=id_exp)
@@ -605,7 +606,7 def experiment_edit(request, id_exp):
605 return render(request, 'experiment_edit.html', kwargs)
606 return render(request, 'experiment_edit.html', kwargs)
606
607
607
608
608 @staff_member_required(login_url='/accounts/login/')
609 @user_passes_test(lambda u:u.is_staff)
609 def experiment_delete(request, id_exp):
610 def experiment_delete(request, id_exp):
610
611
611 experiment = get_object_or_404(Experiment, pk=id_exp)
612 experiment = get_object_or_404(Experiment, pk=id_exp)
@@ -631,7 +632,7 def experiment_delete(request, id_exp):
631 return render(request, 'confirm.html', kwargs)
632 return render(request, 'confirm.html', kwargs)
632
633
633
634
634 @staff_member_required(login_url='/accounts/login/')
635 @user_passes_test(lambda u:u.is_staff)
635 def experiment_export(request, id_exp):
636 def experiment_export(request, id_exp):
636
637
637 experiment = get_object_or_404(Experiment, pk=id_exp)
638 experiment = get_object_or_404(Experiment, pk=id_exp)
@@ -646,7 +647,7 def experiment_export(request, id_exp):
646 return response
647 return response
647
648
648
649
649 @staff_member_required(login_url='/accounts/login/')
650 @user_passes_test(lambda u:u.is_staff)
650 def experiment_import(request, id_exp):
651 def experiment_import(request, id_exp):
651
652
652 experiment = get_object_or_404(Experiment, pk=id_exp)
653 experiment = get_object_or_404(Experiment, pk=id_exp)
@@ -683,7 +684,7 def experiment_import(request, id_exp):
683 return render(request, 'experiment_import.html', kwargs)
684 return render(request, 'experiment_import.html', kwargs)
684
685
685
686
686 @staff_member_required(login_url='/accounts/login/')
687 @user_passes_test(lambda u:u.is_staff)
687 def experiment_mix(request, id_exp):
688 def experiment_mix(request, id_exp):
688
689
689 experiment = get_object_or_404(Experiment, pk=id_exp)
690 experiment = get_object_or_404(Experiment, pk=id_exp)
@@ -777,7 +778,7 def experiment_mix(request, id_exp):
777 return render(request, 'experiment_mix.html', kwargs)
778 return render(request, 'experiment_mix.html', kwargs)
778
779
779
780
780 @staff_member_required(login_url='/accounts/login/')
781 @user_passes_test(lambda u:u.is_staff)
781 def experiment_mix_delete(request, id_exp):
782 def experiment_mix_delete(request, id_exp):
782
783
783 conf = RCConfiguration.objects.get(experiment=id_exp, mix=True)
784 conf = RCConfiguration.objects.get(experiment=id_exp, mix=True)
@@ -788,6 +789,7 def experiment_mix_delete(request, id_exp):
788 return redirect('url_mix_experiment', id_exp=id_exp)
789 return redirect('url_mix_experiment', id_exp=id_exp)
789
790
790
791
792
791 def experiment_summary(request, id_exp):
793 def experiment_summary(request, id_exp):
792
794
793 import json
795 import json
@@ -893,7 +895,7 def experiment_summary(request, id_exp):
893 return render(request, 'experiment_summary.html', kwargs)
895 return render(request, 'experiment_summary.html', kwargs)
894
896
895
897
896 @staff_member_required(login_url='/accounts/login/')
898 @user_passes_test(lambda u:u.is_staff)
897 def experiment_verify(request, id_exp):
899 def experiment_verify(request, id_exp):
898
900
899 import json
901 import json
@@ -990,6 +992,7 def experiment_verify(request, id_exp):
990 return render(request, 'experiment_verify.html', kwargs)
992 return render(request, 'experiment_verify.html', kwargs)
991
993
992
994
995 @user_passes_test(lambda u:u.is_staff)
993 def parse_mix_result(s):
996 def parse_mix_result(s):
994
997
995 values = s.split('-')
998 values = s.split('-')
@@ -1063,7 +1066,7 def dev_conf(request, id_conf):
1063 return redirect(conf.get_absolute_url())
1066 return redirect(conf.get_absolute_url())
1064
1067
1065
1068
1066 @staff_member_required(login_url='/accounts/login/')
1069 @user_passes_test(lambda u:u.is_staff)
1067 def dev_conf_new(request, id_exp=0, id_dev=0):
1070 def dev_conf_new(request, id_exp=0, id_dev=0):
1068
1071
1069 initial = {}
1072 initial = {}
@@ -1137,7 +1140,7 def dev_conf_new(request, id_exp=0, id_dev=0):
1137 return render(request, 'dev_conf_edit.html', kwargs)
1140 return render(request, 'dev_conf_edit.html', kwargs)
1138
1141
1139
1142
1140 @staff_member_required
1143 @user_passes_test(lambda u:u.is_staff)
1141 def dev_conf_edit(request, id_conf):
1144 def dev_conf_edit(request, id_conf):
1142
1145
1143 conf = get_object_or_404(Configuration, pk=id_conf)
1146 conf = get_object_or_404(Configuration, pk=id_conf)
@@ -1166,7 +1169,7 def dev_conf_edit(request, id_conf):
1166 return render(request, '%s_conf_edit.html' % conf.device.device_type.name, kwargs)
1169 return render(request, '%s_conf_edit.html' % conf.device.device_type.name, kwargs)
1167
1170
1168
1171
1169 @staff_member_required
1172 @user_passes_test(lambda u:u.is_staff)
1170 def dev_conf_start(request, id_conf):
1173 def dev_conf_start(request, id_conf):
1171
1174
1172 conf = get_object_or_404(Configuration, pk=id_conf)
1175 conf = get_object_or_404(Configuration, pk=id_conf)
@@ -1181,7 +1184,7 def dev_conf_start(request, id_conf):
1181 return redirect(conf.get_absolute_url())
1184 return redirect(conf.get_absolute_url())
1182
1185
1183
1186
1184 @staff_member_required
1187 @user_passes_test(lambda u:u.is_staff)
1185 def dev_conf_stop(request, id_conf):
1188 def dev_conf_stop(request, id_conf):
1186
1189
1187 conf = get_object_or_404(Configuration, pk=id_conf)
1190 conf = get_object_or_404(Configuration, pk=id_conf)
@@ -1196,7 +1199,7 def dev_conf_stop(request, id_conf):
1196 return redirect(conf.get_absolute_url())
1199 return redirect(conf.get_absolute_url())
1197
1200
1198
1201
1199 @staff_member_required
1202 @user_passes_test(lambda u:u.is_staff)
1200 def dev_conf_status(request, id_conf):
1203 def dev_conf_status(request, id_conf):
1201
1204
1202 conf = get_object_or_404(Configuration, pk=id_conf)
1205 conf = get_object_or_404(Configuration, pk=id_conf)
@@ -1209,7 +1212,7 def dev_conf_status(request, id_conf):
1209 return redirect(conf.get_absolute_url())
1212 return redirect(conf.get_absolute_url())
1210
1213
1211
1214
1212 @staff_member_required
1215 @user_passes_test(lambda u:u.is_staff)
1213 def dev_conf_write(request, id_conf):
1216 def dev_conf_write(request, id_conf):
1214
1217
1215 conf = get_object_or_404(Configuration, pk=id_conf)
1218 conf = get_object_or_404(Configuration, pk=id_conf)
@@ -1223,7 +1226,7 def dev_conf_write(request, id_conf):
1223 return redirect(conf.get_absolute_url())
1226 return redirect(conf.get_absolute_url())
1224
1227
1225
1228
1226 @staff_member_required
1229 @user_passes_test(lambda u:u.is_staff)
1227 def dev_conf_read(request, id_conf):
1230 def dev_conf_read(request, id_conf):
1228
1231
1229 conf = get_object_or_404(Configuration, pk=id_conf)
1232 conf = get_object_or_404(Configuration, pk=id_conf)
@@ -1263,7 +1266,7 def dev_conf_read(request, id_conf):
1263 return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
1266 return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
1264
1267
1265
1268
1266 @staff_member_required
1269 @user_passes_test(lambda u:u.is_staff)
1267 def dev_conf_import(request, id_conf):
1270 def dev_conf_import(request, id_conf):
1268
1271
1269 conf = get_object_or_404(Configuration, pk=id_conf)
1272 conf = get_object_or_404(Configuration, pk=id_conf)
@@ -1311,7 +1314,7 def dev_conf_import(request, id_conf):
1311 return render(request, 'dev_conf_import.html', kwargs)
1314 return render(request, 'dev_conf_import.html', kwargs)
1312
1315
1313
1316
1314 @staff_member_required
1317 @user_passes_test(lambda u:u.is_staff)
1315 def dev_conf_export(request, id_conf):
1318 def dev_conf_export(request, id_conf):
1316
1319
1317 conf = get_object_or_404(Configuration, pk=id_conf)
1320 conf = get_object_or_404(Configuration, pk=id_conf)
@@ -1343,7 +1346,7 def dev_conf_export(request, id_conf):
1343 return render(request, 'dev_conf_export.html', kwargs)
1346 return render(request, 'dev_conf_export.html', kwargs)
1344
1347
1345
1348
1346 @staff_member_required
1349 @user_passes_test(lambda u:u.is_staff)
1347 def dev_conf_delete(request, id_conf):
1350 def dev_conf_delete(request, id_conf):
1348
1351
1349 conf = get_object_or_404(Configuration, pk=id_conf)
1352 conf = get_object_or_404(Configuration, pk=id_conf)
General Comments 0
You need to be logged in to leave comments. Login now