diff --git a/templates/asset_list_table_body.html b/templates/asset_list_table_body.html index cbcb3749..75c6e5c1 100644 --- a/templates/asset_list_table_body.html +++ b/templates/asset_list_table_body.html @@ -8,7 +8,7 @@ visibility edit - content_copy + content_copy {% endfor %} \ No newline at end of file diff --git a/urls.py b/urls.py index 2e87f25d..68727f9f 100644 --- a/urls.py +++ b/urls.py @@ -12,7 +12,6 @@ urlpatterns = [ path('asset//', views.AssetDetail.as_view(), name='asset_detail'), path('asset/create/', views.AssetEdit.as_view(), name='asset_create'), path('asset//edit/', views.AssetEdit.as_view(), name='asset_update'), - path('asset//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'), diff --git a/views.py b/views.py index aa1ce949..2f557574 100644 --- a/views.py +++ b/views.py @@ -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