Put duplication into one view

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

View File

@@ -8,7 +8,7 @@
<td>
<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_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>
</tr>
{% endfor %}

View File

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

View File

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