Organizacion deleted

Author: Andres Vargas

demo/models.py

@@ -34,6 +34,7 @@ class Contact(EntityMix):
 
     class Meta:
         ordering = ("first_name", "last_name")
+        
     @property
     def name(self):
         return f"{self.first_name} {self.last_name}"

demo/static/src/Pages/Organizations.Edit.vue

@@ -5,7 +5,7 @@
       <span class="text-indigo-400 font-medium">/</span>
       {{ form.name }}
     </h1>
-    <trashed-message v-if="organization.deleted_at" class="mb-6" @restore="restore">
+    <trashed-message v-if="organization.deleted" class="mb-6" @restore="restore">
       This organization has been deleted.
     </trashed-message>
     <div class="bg-white rounded shadow overflow-hidden max-w-3xl">
@@ -111,17 +111,17 @@ export default {
   methods: {
     submit() {
       this.sending = true
-      this.$inertia.put(this.route('demo:organizations.edit', this.organization.id), this.form)
+      this.$inertia.post(this.route('demo:organizations.edit', this.organization.id), this.form)
         .then(() => this.sending = false)
     },
     destroy() {
       if (confirm('Are you sure you want to delete this organization?')) {
-        this.$inertia.delete(this.route('organizations.destroy', this.organization.id))
+        this.$inertia.delete(this.route('demo:organizations.edit', this.organization.id))
       }
     },
     restore() {
       if (confirm('Are you sure you want to restore this organization?')) {
-        this.$inertia.put(this.route('organizations.restore', this.organization.id))
+        this.$inertia.put(this.route('demo:organizations.edit', this.organization.id))
       }
     },
   },

demo/static/src/Pages/Organizations.vue

@@ -26,7 +26,7 @@
           <td class="border-t">
             <inertia-link class="px-6 py-4 flex items-center focus:text-indigo-500" :href="route('demo:organizations.edit', organization.id)">
               {{ organization.name }}
-              <icon v-if="organization.deleted_at" name="trash" class="flex-shrink-0 w-3 h-3 fill-gray-400 ml-2" />
+              <icon v-if="organization.deleted" name="trash" class="flex-shrink-0 w-3 h-3 fill-gray-400 ml-2" />
             </inertia-link>
           </td>
           <td class="border-t">
@@ -88,7 +88,7 @@ export default {
       handler: throttle(function() {
         let query = pickBy(this.form)
         let url = this.route('demo:organizations') + "?";
-        url += Object.keys(query).length ? "&search=" + query.search : "&remember=true" 
+        url += Object.keys(query).length ? "&search=" + query.search + "&trashed="+ query.trashed : "&remember=true" 
         console.log("url", url);
         this.$inertia.replace(url)
 

demo/utils.py

@@ -1,14 +1,18 @@
 from inertia.share import share
 from django.core.paginator import Paginator, EmptyPage
 from django.urls import reverse
-
+from django.db import models
 
 def _filter(request, objects, filter_param):
     trashed = request.GET.get("trashed","")
     if trashed == "with":
+        objects = objects.filter(models.Q(deleted=True)|models.Q(deleted=False))
+    elif trashed == "only":
         objects = objects.filter(deleted=True)
     search =  request.GET.get("search", "")
-    if search != "" and search !="undefined":
+    if search =="undefined":
+        search = ""
+    if search != "":
         d = {filter_param: search}
         objects = objects.filter(**d)
     return objects

demo/views.py

@@ -15,16 +15,39 @@
 def organization_edit(request, id):
     organization = Organization.objects.get(id=id)
     schema = OrganizationSchema()
+
+    if request.method == "POST":
+        try:
+            schema.loads(request.body)
+        except ValidationError as err:
+            share_flash(request, error="Exists errors on form")
+            share_flash(request, errors= err.messages)
+        else:
+            Organization.objects.filter(id=id).update(**data)
+            share_flash(request, success="Updated Organization")
+            return redirect(reverse("demo:organizations"))
+    if request.method == "DELETE":
+        organization.deleted = True
+        organization.save()
+        share_flash(request, success="Organization Deleted")
+        return redirect(reverse("demo:organizations"))
+    if request.method == "PUT":
+        organization.deleted = False
+        organization.save()
+        share_flash(request, success="Organization Undeleted")
+        return redirect(reverse("demo:organizations"))
+
+    org = schema.dump(organization)
     props = {
-        'organization': schema.dump(organization)
+        'organization': org
     }
     return render_inertia(request, "Organizations.Edit", props)
 
 
 def organizations(request):
     org_sche = OrganizationSchema(many=True)
     objects = Organization.objects.all()
-    _filter(request, objects, "name__icontains")
+    objects = _filter(request, objects, "name__icontains")
     args = ("id","name", 'region','city','phone')
     objs, links = _get_objs(request, objects, args,"demo:organizations")
     trashed = request.GET.get("trashed","")
@@ -84,8 +107,6 @@ def contact_edit(request, id):
         share_flash(request, success="Contact Deleted")
         return redirect(reverse("demo:contacts"))
 
-
-
     props = {
         'contact': c.dump(contact),
         'organizations': org_schema.dump(orgs)