arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-20 15:02:31 +00:00
Code Issues Projects Releases Wiki Activity

Put duplication into one view

Browse Source
This commit is contained in:
Harry Bridge
2019-01-31 20:03:08 +00:00
parent 9480f697ff
commit 1ef60943ea
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/asset_list_table_body.html
View File

@@ -8,7 +8,7 @@
<td> <td>
<a href="{% url 'asset_detail' item.pk %}"><i class="material-icons">visibility</i></a> <a href="{% url 'asset_detail' item.pk %}"><i class="material-icons">visibility</i></a>
<a href="{% url 'asset_update' item.pk %}"><i class="material-icons">edit</i></a> <a href="{% url 'asset_update' item.pk %}"><i class="material-icons">edit</i></a>
<a href="{% url 'asset_duplicate' item.pk %}"><i class="material-icons">content_copy</i></a> <a href="{% url 'asset_update' item.pk %}?duplicate=true"><i class="material-icons">content_copy</i></a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

1
urls.py
View File

@@ -12,7 +12,6 @@ urlpatterns = [
path('asset/<int:pk>/', views.AssetDetail.as_view(), name='asset_detail'), path('asset/<int:pk>/', views.AssetDetail.as_view(), name='asset_detail'),
path('asset/create/', views.AssetEdit.as_view(), name='asset_create'), path('asset/create/', views.AssetEdit.as_view(), name='asset_create'),
path('asset/<int:pk>/edit/', views.AssetEdit.as_view(), name='asset_update'), path('asset/<int:pk>/edit/', views.AssetEdit.as_view(), name='asset_update'),
path('asset/<int:pk>/duplicate/', views.AssetDuplicate.as_view(), name='asset_duplicate'),
path('asset/delete/', views.asset_delete, name='ajax_asset_delete'), path('asset/delete/', views.asset_delete, name='ajax_asset_delete'),
path('asset/filter/', views.asset_filter, name='ajax_asset_filter'), path('asset/filter/', views.asset_filter, name='ajax_asset_filter'),
path('asset/update/', views.asset_update, name='ajax_asset_update'), path('asset/update/', views.asset_update, name='ajax_asset_update'),

24
views.py
View File

@@ -60,22 +60,16 @@ class AssetEdit(LoginRequiredMixin, generic.TemplateView):
context['object'] = get_object_or_404(models.Asset, pk=self.kwargs['pk']) context['object'] = get_object_or_404(models.Asset, pk=self.kwargs['pk'])
context['form'] = forms.AssetForm context['form'] = forms.AssetForm
# context['asset_names'] = models.Asset.objects.values_list('asset_id', 'description').order_by('-date_acquired')[] # context['asset_names'] = models.Asset.objects.values_list('asset_id', 'description').order_by('-date_acquired')[]
context['edit'] = True
return context if self.request.GET.get('duplicate'):
context['duplicate'] = True
context['previous_asset_id'] = context['object'].asset_id
class AssetDuplicate(LoginRequiredMixin, generic.TemplateView): context['previous_asset_pk'] = context['object'].pk
template_name = 'asset_update.html' context['object'].pk = 0
context['object'].asset_id = ''
def get_context_data(self, **kwargs): context['object'].serial_number = ''
context = super(AssetDuplicate, self).get_context_data(**kwargs) else:
if self.kwargs: context['edit'] = True
context['object'] = get_object_or_404(models.Asset, pk=self.kwargs['pk'])
context['object'].pk = None
context['form'] = forms.AssetForm
# context['asset_names'] = models.Asset.objects.values_list('asset_id', 'description').order_by('-date_acquired')[]
context['duplicate'] = True
return context return context