Fixes #357, removes the ability to delete assets

assets/static/js/ajax_form.js

@@ -1,41 +0,0 @@
-
-
-
-
-function formAssetSearch() {
-        $.ajax({
-        url : "/asset/filter/", // the endpoint
-        type : "POST", // http method
-        data : {
-            sender: 'asset_update',
-            form: "csrfmiddlewaretoken=" + $('input[name=csrfmiddlewaretoken]').val() + "&asset_id=" + $('#parent_search').val()
-        },
-        traditional: true,
-
-        success : function(data) {
-            // console.log(data);
-            $('#formAssetSearchResult').html(data);
-            // window.location.href = data['url'];
-        },
-
-        error : function(xhr) {console.log(xhr.status + ": " + xhr.responseText)}
-    });
-}
-
-function deleteAsset(asset_id) {
-    $.ajax({
-        url : "/asset/delete/", // the endpoint
-        type : "POST", // http method
-        data : {
-            asset_id: asset_id
-        },
-        traditional: true,
-
-        success : function(data) {
-            // console.log(data);
-            window.location.href = data['url'];
-        },
-
-        error : function(xhr) {console.log(xhr.status + ": " + xhr.responseText)}
-    });
-}

assets/templates/asset_create.html

@@ -53,8 +53,6 @@
     </div>
   </form>
 
-  {% include 'partials/confirm_delete.html' with object=object %}
-
   {% endblock %}
 
   {% block js%}

assets/templates/asset_update.html

@@ -52,8 +52,6 @@
   </div>
 </form>
 
-{% include 'partials/confirm_delete.html' with object=object %}
-
 {% endblock %}
 
 {% block js%}

assets/templates/partials/asset_buttons.html

@@ -2,7 +2,6 @@
 <!--edit-->
 <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
 <a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-<a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
 {% elif duplicate %}
 <!--duplicate-->
 <button type="submit" class="btn btn-default"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
@@ -14,7 +13,6 @@
 <div class="btn-group">
     <a href="{% url 'asset_update' object.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
     <a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-    <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
 </div>
 {% endif %}
 {% if create or edit or duplicate %}

assets/templates/partials/confirm_delete.html

@@ -1,20 +0,0 @@
-<div id="confirm_delete_modal" class="modal fade" tabindex="-1" role="dialog">
-  <div class="modal-dialog modal-sm" role="document">
-    <form method="post" id="confirm_delete_form">
-      {% csrf_token %}
-      <div class="modal-content">
-        <div class="modal-header">
-          <h4 class="modal-title">Confirm Delete</h4>
-        </div>
-        <div class="modal-body">
-        <p>Are you sure you want to delete asset:</p>
-        <p><strong>{{ object }}</strong></p>
-      </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-danger" onclick="deleteAsset({{ object.id }})" data-dismiss="modal"><i class="glyphicon glyphicon-trash"></i> Delete</button>
-          <button class="btn btn-success" data-dismiss="modal">Cancel</button>
-        </div>
-      </div>
-    </form>
-  </div>
-</div>

assets/urls.py

@@ -14,7 +14,6 @@ urlpatterns = [
     path('asset/create/', permission_required_with_403('assets.create_asset')(views.AssetCreate.as_view()), name='asset_create'),
     path('asset/<int:pk>/edit/', permission_required_with_403('assets.change_asset')(views.AssetEdit.as_view()), name='asset_update'),
     path('asset/<int:pk>/duplicate/', permission_required_with_403('assets.create_asset')(views.AssetDuplicate.as_view()), name='asset_duplicate'),
-    path('asset/delete/', permission_required_with_403('assets.delete_asset')(views.asset_delete), name='ajax_asset_delete'),
 
     path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'),
 

assets/views.py

@@ -122,18 +122,6 @@ class AssetDuplicate(DuplicateMixin, AssetCreate):
         return context
 
 
-@login_required()
-def asset_delete(request):
-    context = dict()
-    if request.method == 'POST' and request.is_ajax():
-        asset = get_object_or_404(models.Asset, pk=request.POST.get('asset_id', None))
-        asset.delete()
-
-        context['url'] = reverse('asset_list')
-
-        return HttpResponse(json.dumps(context), content_type='application/json')
-
-
 class SupplierList(generic.ListView):
     model = models.Supplier
     template_name = 'supplier_list.html'