##// END OF EJS Templates
Views: Display "Page not found (404)" in case there is no object with the given pk....
Miguel Urco -
r20:391e0c460449
parent child
Show More
@@ -1,6 +1,6
1 # Create your views here.
1 # Create your views here.
2
2
3 from django.shortcuts import redirect, render
3 from django.shortcuts import redirect, render, get_object_or_404
4
4
5 from apps.main.models import Experiment, Configuration
5 from apps.main.models import Experiment, Configuration
6 from .models import DDSConfiguration
6 from .models import DDSConfiguration
@@ -9,7 +9,7 from .forms import DDSConfigurationForm
9
9
10 def dds_conf(request, id_conf):
10 def dds_conf(request, id_conf):
11
11
12 conf = DDSConfiguration.objects.get(pk=id_conf)
12 conf = get_object_or_404(DDSConfiguration, pk=id_conf)
13
13
14 kwargs = {}
14 kwargs = {}
15 kwargs['dev_conf'] = conf
15 kwargs['dev_conf'] = conf
@@ -42,7 +42,7 def dds_conf(request, id_conf):
42
42
43 def dds_conf_edit(request, id_conf):
43 def dds_conf_edit(request, id_conf):
44
44
45 conf = DDSConfiguration.objects.get(pk=id_conf)
45 conf = get_object_or_404(DDSConfiguration, pk=id_conf)
46
46
47 if request.method=='GET':
47 if request.method=='GET':
48 form = DDSConfigurationForm(instance=conf)
48 form = DDSConfigurationForm(instance=conf)
@@ -1,4 +1,4
1 from django.shortcuts import render, redirect, HttpResponse
1 from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
2
2
3 from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm
3 from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm
4 from apps.cgs.forms import CGSConfigurationForm
4 from apps.cgs.forms import CGSConfigurationForm
@@ -58,7 +58,7 def devices(request):
58
58
59 def device(request, id_dev):
59 def device(request, id_dev):
60
60
61 device = Device.objects.get(pk=id_dev)
61 device = get_object_or_404(Device, pk=id_dev)
62
62
63 kwargs = {}
63 kwargs = {}
64 kwargs['device'] = device
64 kwargs['device'] = device
@@ -93,7 +93,7 def device_new(request):
93
93
94 def device_edit(request, id_dev):
94 def device_edit(request, id_dev):
95
95
96 device = Device.objects.get(pk=id_dev)
96 device = get_object_or_404(Device, pk=id_dev)
97
97
98 if request.method=='GET':
98 if request.method=='GET':
99 form = DeviceForm(instance=device)
99 form = DeviceForm(instance=device)
@@ -115,7 +115,7 def device_edit(request, id_dev):
115
115
116 def device_delete(request, id_dev):
116 def device_delete(request, id_dev):
117
117
118 device = Device.objects.get(pk=id_dev)
118 device = get_object_or_404(Device, pk=id_dev)
119
119
120 if request.method=='POST':
120 if request.method=='POST':
121
121
@@ -147,7 +147,7 def campaigns(request):
147
147
148 def campaign(request, id_camp):
148 def campaign(request, id_camp):
149
149
150 campaign = Campaign.objects.get(pk=id_camp)
150 campaign = get_object_or_404(Campaign, pk=id_camp)
151 experiments = Experiment.objects.filter(campaign=campaign)
151 experiments = Experiment.objects.filter(campaign=campaign)
152
152
153 form = CampaignForm(instance=campaign)
153 form = CampaignForm(instance=campaign)
@@ -191,7 +191,7 def campaign_new(request):
191
191
192 def campaign_edit(request, id_camp):
192 def campaign_edit(request, id_camp):
193
193
194 campaign = Campaign.objects.get(pk=id_camp)
194 campaign = get_object_or_404(Campaign, pk=id_camp)
195
195
196 if request.method=='GET':
196 if request.method=='GET':
197 form = CampaignForm(instance=campaign)
197 form = CampaignForm(instance=campaign)
@@ -213,7 +213,7 def campaign_edit(request, id_camp):
213
213
214 def campaign_delete(request, id_camp):
214 def campaign_delete(request, id_camp):
215
215
216 campaign = Campaign.objects.get(pk=id_camp)
216 campaign = get_object_or_404(Campaign, pk=id_camp)
217
217
218 if request.method=='POST':
218 if request.method=='POST':
219 if request.user.is_staff:
219 if request.user.is_staff:
@@ -246,7 +246,7 def experiments(request):
246
246
247 def experiment(request, id_exp):
247 def experiment(request, id_exp):
248
248
249 experiment = Experiment.objects.get(pk=id_exp)
249 experiment = get_object_or_404(Experiment, pk=id_exp)
250
250
251 experiments = Experiment.objects.filter(campaign=experiment.campaign)
251 experiments = Experiment.objects.filter(campaign=experiment.campaign)
252 configurations = Configuration.objects.filter(experiment=experiment)
252 configurations = Configuration.objects.filter(experiment=experiment)
@@ -294,7 +294,7 def experiment_new(request, id_camp=0):
294
294
295 def experiment_edit(request, id_exp):
295 def experiment_edit(request, id_exp):
296
296
297 experiment = Experiment.objects.get(pk=id_exp)
297 experiment = get_object_or_404(Experiment, pk=id_exp)
298
298
299 if request.method == 'GET':
299 if request.method == 'GET':
300 form = ExperimentForm(instance=experiment)
300 form = ExperimentForm(instance=experiment)
@@ -316,7 +316,7 def experiment_edit(request, id_exp):
316
316
317 def experiment_delete(request, id_exp):
317 def experiment_delete(request, id_exp):
318
318
319 experiment = Experiment.objects.get(pk=id_exp)
319 experiment = get_object_or_404(Experiment, pk=id_exp)
320
320
321 if request.method=='POST':
321 if request.method=='POST':
322 if request.user.is_staff:
322 if request.user.is_staff:
@@ -350,7 +350,7 def dev_confs(request):
350
350
351 def dev_conf(request, id_conf):
351 def dev_conf(request, id_conf):
352
352
353 conf = Configuration.objects.get(pk=id_conf)
353 conf = get_object_or_404(Configuration, pk=id_conf)
354
354
355 DevConfModel = CONF_MODELS[conf.device.device_type.name]
355 DevConfModel = CONF_MODELS[conf.device.device_type.name]
356 dev_conf = DevConfModel.objects.get(pk=id_conf)
356 dev_conf = DevConfModel.objects.get(pk=id_conf)
@@ -411,7 +411,7 def dev_conf_new(request, id_exp=0):
411
411
412 def dev_conf_edit(request, id_conf):
412 def dev_conf_edit(request, id_conf):
413
413
414 conf = Configuration.objects.get(pk=id_conf)
414 conf = get_object_or_404(Configuration, pk=id_conf)
415
415
416 DevConfModel = CONF_MODELS[conf.device.device_type.name]
416 DevConfModel = CONF_MODELS[conf.device.device_type.name]
417 DevConfForm = CONF_FORMS[conf.device.device_type.name]
417 DevConfForm = CONF_FORMS[conf.device.device_type.name]
@@ -438,7 +438,7 def dev_conf_edit(request, id_conf):
438
438
439 def dev_conf_delete(request, id_conf):
439 def dev_conf_delete(request, id_conf):
440
440
441 conf = Configuration.objects.get(pk=id_conf)
441 conf = get_object_or_404(Configuration, pk=id_conf)
442
442
443 if request.method=='POST':
443 if request.method=='POST':
444 if request.user.is_staff:
444 if request.user.is_staff:
General Comments 0
You need to be logged in to leave comments. Login now