radarsys Commit - r19:225e7bf681bc · Jicamarca Repository

views name were changed ...

Miguel Urco -

r19:225e7bf681bc

parent child

Context file:

r19:225e7bf681bc

Collapse all files

apps/abs/urls.py +1 -1

             urlpatterns = (
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_abs_conf'),
-                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_abs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_abs_conf'),
             )

apps/cgs/urls.py +1 -1

                 #url(r'^configuration/$', 'apps.cgs.views.configurate_frequencies', name='new_device'),
             #     url(r'^(?P<id>-?\d+)/$', 'apps.cgs.views.configurate_frequencies', name='new_device'),
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_cgs_conf'),
-                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_cgs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_cgs_conf'),
             )

apps/dds/urls.py +1 -1

             urlpatterns = (
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.dds.views.dds_conf', name='url_dds_conf'),
-                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.dds.views.edit_dds_conf', name='url_edit_dds_conf'),
+                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.dds.views.dds_conf_edit', name='url_edit_dds_conf'),
             )

apps/dds/views.py +1 -1

                 return render(request, 'dds_conf.html', kwargs)
-            def edit_dds_conf(request, id_conf):
+            def dds_conf_edit(request, id_conf):
                 conf = DDSConfiguration.objects.get(pk=id_conf)

apps/jars/urls.py +1 -1

             urlpatterns = (
             #     url(r'^(?P<id>-?\d+)/$', 'apps.jars.views.jars_config', name='jars'),
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_jars_conf'),
-                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_jars_conf'),
+                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_jars_conf'),
             )

apps/main/urls.py +12 -12

             from django.conf.urls import url
             urlpatterns = (
-                url(r'^device/add/$', 'apps.main.views.add_device', name='url_add_device'),
+                url(r'^device/new/$', 'apps.main.views.device_new', name='url_add_device'),
                 url(r'^device/$', 'apps.main.views.devices', name='url_devices'),
                 url(r'^device/(?P<id_dev>-?\d+)/$', 'apps.main.views.device', name='url_device'),
-                url(r'^device/(?P<id_dev>-?\d+)/edit/$', 'apps.main.views.edit_device', name='url_edit_device'),
+                url(r'^device/(?P<id_dev>-?\d+)/edit/$', 'apps.main.views.device_edit', name='url_edit_device'),
-                url(r'^device/(?P<id_dev>-?\d+)/delete/$', 'apps.main.views.delete_device', name='url_delete_device'),
+                url(r'^device/(?P<id_dev>-?\d+)/delete/$', 'apps.main.views.device_delete', name='url_delete_device'),
-                url(r'^campaign/add/$', 'apps.main.views.add_campaign', name='url_add_campaign'),
+                url(r'^campaign/new/$', 'apps.main.views.campaign_new', name='url_add_campaign'),
                 url(r'^campaign/$', 'apps.main.views.campaigns', name='url_campaigns'),
                 url(r'^campaign/(?P<id_camp>-?\d+)/$', 'apps.main.views.campaign', name='url_campaign'),
-                url(r'^campaign/(?P<id_camp>-?\d+)/edit/$', 'apps.main.views.edit_campaign', name='url_edit_campaign'),
+                url(r'^campaign/(?P<id_camp>-?\d+)/edit/$', 'apps.main.views.campaign_edit', name='url_edit_campaign'),
-                url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', 'apps.main.views.delete_campaign', name='url_delete_campaign'),
+                url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', 'apps.main.views.campaign_delete', name='url_delete_campaign'),
-                url(r'^campaign/(?P<id_camp>-?\d+)/add_experiment/$', 'apps.main.views.add_experiment', name='url_add_experiment'),
+                url(r'^campaign/(?P<id_camp>-?\d+)/new_experiment/$', 'apps.main.views.experiment_new', name='url_add_experiment'),
                 url(r'^experiment/$', 'apps.main.views.experiments', name='url_experiments'),
                 url(r'^experiment/(?P<id_exp>-?\d+)/$', 'apps.main.views.experiment', name='url_experiment'),
-                url(r'^experiment/(?P<id_exp>-?\d+)/edit/$', 'apps.main.views.edit_experiment', name='url_edit_experiment'),
+                url(r'^experiment/(?P<id_exp>-?\d+)/edit/$', 'apps.main.views.experiment_edit', name='url_edit_experiment'),
-                url(r'^experiment/(?P<id_exp>-?\d+)/delete/$', 'apps.main.views.delete_experiment', name='url_delete_experiment'),
+                url(r'^experiment/(?P<id_exp>-?\d+)/delete/$', 'apps.main.views.experiment_delete', name='url_delete_experiment'),
-                url(r'^experiment/(?P<id_exp>-?\d+)/add_dev_conf/$', 'apps.main.views.add_dev_conf', name='url_add_dev_conf'),
+                url(r'^experiment/(?P<id_exp>-?\d+)/new_dev_conf/$', 'apps.main.views.dev_conf_new', name='url_add_dev_conf'),
                 url(r'^dev_conf/$', 'apps.main.views.dev_confs', name='url_dev_confs'),
                 url(r'^dev_conf/(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_dev_conf'),
-                url(r'^dev_conf/(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_dev_conf'),
+                url(r'^dev_conf/(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_dev_conf'),
-                url(r'^dev_conf/(?P<id_conf>-?\d+)/delete/$', 'apps.main.views.delete_dev_conf', name='url_delete_dev_conf'),
+                url(r'^dev_conf/(?P<id_conf>-?\d+)/delete/$', 'apps.main.views.dev_conf_delete', name='url_delete_dev_conf'),
             )

apps/main/views.py +13 -128

@@ -71,7 +71,7 def device(request, id_dev):
71		71
72	return render(request, 'device.html', kwargs)	72	return render(request, 'device.html', kwargs)
73		73
74	def ~~add_~~device(request):	74	def device_new(request):
75		75
76	if request.method == 'GET':	76	if request.method == 'GET':
77	form = DeviceForm()	77	form = DeviceForm()
@@ -91,7 +91,7 def add_device(request):
91		91
92	return render(request, 'device_edit.html', kwargs)	92	return render(request, 'device_edit.html', kwargs)
93		93
94	def ~~edit_~~device(request, id_dev):	94	def device_edit(request, id_dev):
95		95
96	device = Device.objects.get(pk=id_dev)	96	device = Device.objects.get(pk=id_dev)
97		97
@@ -113,7 +113,7 def edit_device(request, id_dev):
113		113
114	return render(request, 'device_edit.html', kwargs)	114	return render(request, 'device_edit.html', kwargs)
115		115
116	def de~~lete_devic~~e(request, id_dev):	116	def device_delete(request, id_dev):
117		117
118	device = Device.objects.get(pk=id_dev)	118	device = Device.objects.get(pk=id_dev)
119		119
@@ -169,7 +169,7 def campaign(request, id_camp):
169		169
170	return render(request, 'campaign.html', kwargs)	170	return render(request, 'campaign.html', kwargs)
171		171
172	def ~~add_~~campaign(request):	172	def campaign_new(request):
173		173
174	if request.method == 'GET':	174	if request.method == 'GET':
175	form = CampaignForm()	175	form = CampaignForm()
@@ -189,7 +189,7 def add_campaign(request):
189		189
190	return render(request, 'campaign_edit.html', kwargs)	190	return render(request, 'campaign_edit.html', kwargs)
191		191
192	def ~~edit_~~campaign(request, id_camp):	192	def campaign_edit(request, id_camp):
193		193
194	campaign = Campaign.objects.get(pk=id_camp)	194	campaign = Campaign.objects.get(pk=id_camp)
195		195
@@ -211,7 +211,7 def edit_campaign(request, id_camp):
211		211
212	return render(request, 'campaign_edit.html', kwargs)	212	return render(request, 'campaign_edit.html', kwargs)
213		213
214	def ~~delete_~~campaign(request, id_camp):	214	def campaign_delete(request, id_camp):
215		215
216	campaign = Campaign.objects.get(pk=id_camp)	216	campaign = Campaign.objects.get(pk=id_camp)
217		217
@@ -272,7 +272,7 def experiment(request, id_exp):
272		272
273	return render(request, 'experiment.html', kwargs)	273	return render(request, 'experiment.html', kwargs)
274		274
275	def ~~add_~~experiment(request, id_camp=0):	275	def experiment_new(request, id_camp=0):
276		276
277	if request.method == 'GET':	277	if request.method == 'GET':
278	form = ExperimentForm(initial={'campaign':id_camp})	278	form = ExperimentForm(initial={'campaign':id_camp})
@@ -292,7 +292,7 def add_experiment(request, id_camp=0):
292		292
293	return render(request, 'experiment_edit.html', kwargs)	293	return render(request, 'experiment_edit.html', kwargs)
294		294
295	def ~~edit_~~experiment(request, id_exp):	295	def experiment_edit(request, id_exp):
296		296
297	experiment = Experiment.objects.get(pk=id_exp)	297	experiment = Experiment.objects.get(pk=id_exp)
298		298
@@ -314,7 +314,7 def edit_experiment(request, id_exp):
314		314
315	return render(request, 'experiment_edit.html', kwargs)	315	return render(request, 'experiment_edit.html', kwargs)
316		316
317	def ~~delete_~~experiment(request, id_exp):	317	def experiment_delete(request, id_exp):
318		318
319	experiment = Experiment.objects.get(pk=id_exp)	319	experiment = Experiment.objects.get(pk=id_exp)
320		320
@@ -379,7 +379,7 def dev_conf(request, id_conf):
379		379
380	return render(request, 'dev_conf.html', kwargs)	380	return render(request, 'dev_conf.html', kwargs)
381		381
382	def ~~add_~~dev_conf(request, id_exp=0):	382	def dev_conf_new(request, id_exp=0):
383		383
384	if request.method == 'GET':	384	if request.method == 'GET':
385	form = ConfigurationForm(initial={'experiment':id_exp})	385	form = ConfigurationForm(initial={'experiment':id_exp})
@@ -409,7 +409,7 def add_dev_conf(request, id_exp=0):
409		409
410	return render(request, 'dev_conf_edit.html', kwargs)	410	return render(request, 'dev_conf_edit.html', kwargs)
411		411
412	def ~~edit_~~dev_conf(request, id_conf):	412	def dev_conf_edit(request, id_conf):
413		413
414	conf = Configuration.objects.get(pk=id_conf)	414	conf = Configuration.objects.get(pk=id_conf)
415		415
@@ -436,7 +436,7 def edit_dev_conf(request, id_conf):
436		436
437	return render(request, 'dev_conf_edit.html', kwargs)	437	return render(request, 'dev_conf_edit.html', kwargs)
438		438
439	def ~~delete_~~dev_conf(request, id_conf):	439	def dev_conf_delete(request, id_conf):
440		440
441	conf = Configuration.objects.get(pk=id_conf)	441	conf = Configuration.objects.get(pk=id_conf)
442		442
@@ -451,119 +451,4 def delete_dev_conf(request, id_conf):
451	kwargs = {'object':conf, 'conf_active':'active',	451	kwargs = {'object':conf, 'conf_active':'active',
452	'url_cancel':'url_dev_conf', 'id_item':id_conf}	452	'url_cancel':'url_dev_conf', 'id_item':id_conf}
453		453
454	return render(request, 'item_delete.html', kwargs)	454	return render(request, 'item_delete.html', kwargs) No newline at end of file
455
456	# def experiment(request, id_exp=0, id_dev_type=0):
457	# kwargs = {}
458	# if id_exp:
459	# experiment = Experiment.objects.get(pk=id_exp)
460	# devices = Configuration.objects.filter(configuration__experiment=experiment)
461	# kwargs['experiment'] = experiment
462	# kwargs['experiment_keys'] = ['campaign', 'name', 'start_time', 'end_time']
463	#
464	# form = ExperimentForm(instance=experiment)
465	#
466	# if id_dev_type:
467	# subform = DeviceTypeForm(initial={'device_type':id_dev_type})
468	# kwargs['keys'] = ['ip_address']
469	# keys = ['id']+kwargs['keys']
470	# kwargs['items'] = Device.objects.filter(device_type=id_dev_type).values(*keys)
471	# else:
472	# subform = DeviceTypeForm()
473	#
474	# kwargs['form'] = form
475	# kwargs['subform'] = subform
476	# kwargs['device_keys'] = ['device_type__name', 'ip_address']
477	# kwargs['devices'] = devices.values('device_type__name', 'ip_address', 'configuration__id')
478	# kwargs['suptitle'] = 'Detail'
479	# else:
480	# experiments = Experiment.objects.all().order_by('start_time')
481	# kwargs['keys'] = ['name', 'start_time', 'end_time']
482	# keys = ['id']+kwargs['keys']
483	# kwargs['items'] = experiments.values(*keys)
484	# kwargs['suptitle'] = 'List'
485	# kwargs['button'] = 'Add Experiment'
486	#
487	# kwargs['id_dev_type'] = id_dev_type
488	# kwargs['id_exp'] = id_exp
489	# return render_to_response("experiment.html", kwargs, context_instance=RequestContext(request))
490
491	# def edit_experiment(request, id_exp):
492	# if request.method=='POST':
493	# experiment = Experiment.objects.get(pk=id_exp)
494	# form = ExperimentForm(request.POST, instance=experiment)
495	# if form.is_valid():
496	# form.save()
497	# return redirect('experiment', id_exp=id_exp)
498
499	# def experiment_add_device(request, id_exp):
500	# if request.method=='POST':
501	# experiment = Experiment.objects.get(pk=id_exp)
502	#
503	# exp_devices = Device.objects.filter(configuration__experiment=experiment)
504	#
505	# device = Device.objects.get(pk=request.POST['device'])
506	#
507	# if device.id in exp_devices.values('id',):
508	# return redirect('experiment', id_exp=id_exp)
509	#
510	# model = MODELS[device.device_type.alias]
511	# conf = model(experiment=experiment, device=device)
512	# conf.save()
513	# return redirect('experiment', id_exp=id_exp)
514
515	# def add_experiment(request):
516	#
517	# kwargs = {}
518	# if request.method == 'POST':
519	# form = ExperimentForm(request.POST)
520	# if form.is_valid():
521	# experiment = form.save()
522	# return redirect('experiment', id_exp=experiment.id)
523	# else:
524	# form = ExperimentForm()
525	# kwargs['form_new'] = form
526	# kwargs['title'] = 'Experiment'
527	# kwargs['suptitle'] = 'New'
528	# kwargs['id_exp'] = 0
529	# return render_to_response("experiment.html", kwargs, context_instance=RequestContext(request))
530
531	# def device(request, id_dev=0):
532	# kwargs = {}
533	# if id_dev:
534	# device = Device.objects.get(pk=id_dev)
535	# kwargs['form'] = DeviceForm(instance=device)
536	# kwargs['action'] = 'edit/'
537	# kwargs['button'] = 'Update'
538	# kwargs['suptitle'] = 'Detail'
539	# else:
540	# devices = Device.objects.all()
541	# kwargs['keys'] = ['device_type__name', 'ip_address']
542	# keys = ['id']+kwargs['keys']
543	# kwargs['items'] = devices.values(*keys)
544	# kwargs['suptitle'] = 'List'
545	# kwargs['button'] = 'Add Device'
546	# return render_to_response("device.html", kwargs, context_instance=RequestContext(request))
547	#
548	# def edit_device(request, id_dev):
549	# if request.method=='POST':
550	# device = Device.objects.get(pk=id_dev)
551	# form = DeviceForm(request.POST, instance=device)
552	# if form.is_valid():
553	# form.save()
554	# return redirect('devices')
555	#
556	# def add_device(request):
557	# kwargs = {}
558	# if request.method == 'POST':
559	# form = DeviceForm(request.POST)
560	# if form.is_valid():
561	# form.save()
562	# return redirect('devices')
563	# else:
564	# form = DeviceForm()
565	# kwargs['form'] = form
566	# kwargs['button'] = 'Create'
567	# kwargs['suptitle'] = 'New'
568	# return render_to_response("device.html", kwargs, context_instance=RequestContext(request))
569

apps/rc/urls.py +1 -1

             urlpatterns = (
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_rc_conf'),
-                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_rc_conf'),
+                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_rc_conf'),
             )

apps/usrp/urls.py +1 -1

             urlpatterns = (
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_usrp_conf'),
-                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_usrp_conf'),
+                url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_usrp_conf'),
             )

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages