diff --git a/.vscode/settings.json b/.vscode/settings.json index cad7657..b1eb010 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "cmake.configureOnOpen": false + "cmake.configureOnOpen": false, + "python.pythonPath": ".venv\\Scripts\\python.exe" } \ No newline at end of file diff --git a/serviceCRM/urls.py b/serviceCRM/urls.py index 7367ed0..ac3fe81 100644 --- a/serviceCRM/urls.py +++ b/serviceCRM/urls.py @@ -24,7 +24,7 @@ urlpatterns = [ path("insert/", view.InsertNew.insert, name="insert"), path("edit//", view.Update.as_view(), name="update"), path("nalog//", view.Nalog, name="nalog"), - path("delete//", view.Delete.Delete, name="delete"), + path("delete//", view.Delete.delete, name="delete"), path("done/", view.Done.as_view(), name="done"), path("done//", view.Done.done_by_id, name="done"), path("datatable/", view.DatatableView.as_view(), name="datatable"), diff --git a/serviceCRM/views.py b/serviceCRM/views.py index be74bed..8dfa634 100644 --- a/serviceCRM/views.py +++ b/serviceCRM/views.py @@ -38,7 +38,10 @@ class Update(generic.UpdateView): def Nalog(request, id): - data = Insert.objects.get(id=id) + try: + data = Insert.objects.get(id=id) + except: + return HttpResponseRedirect("/") template = "serviceCRM/nalog.html" context = {"name": data.name, "phone": data.phone, "desc": data.description, "date": data.date} return render(request, template, context) @@ -57,9 +60,10 @@ class Done(SingleTableView): context = {"name": req.name, "phone": req.phone, "desc": req.description, "date": req.date} return HttpResponse(f"Report ID: {id} \nName: {req.name} \nPhone: {req.phone} \nDescription: {req.description} \n Note:{req.note} \nDate: {req.date} \nDone: {req.done} \nRepair: {req.repair} \n Plateno: {req.plateno} \n") -class Delete(): +class Delete(generic.View): model = Insert - def Delete(request, id): + + def delete(request, id): req = get_object_or_404(Insert, id=id) req.delete() return HttpResponseRedirect("/")