Changed annotation syntax to properties and created mutable user_properties #31

Open
rskthomas wants to merge 20 commits from rework/properties into main
2 changed files with 40 additions and 1 deletions
Showing only changes of commit b7d7b9041d - Show all commits

View File

@ -9,7 +9,7 @@ urlpatterns = [
path("<str:pk>/", views.DetailsView.as_view(), name="details"),
path("<str:pk>/user_property/add", views.AddUserPropertyView.as_view(), name="add_user_property"),
path("user_property/<int:pk>/delete", views.DeleteUserPropertyView.as_view(), name="delete_user_property"),
path("user_property/<int:pk>/update", views.AddUserPropertyView.as_view(), name="update_user_property"),
path("user_property/<int:pk>/update", views.UpdateUserPropertyView.as_view(), name="update_user_property"),
path("<str:pk>/document/add", views.AddDocumentView.as_view(), name="add_document"),
path("<str:pk>/public/", views.PublicDeviceWebView.as_view(), name="device_web"),

View File

@ -201,6 +201,45 @@ class AddUserPropertyView(DashboardView, CreateView):
kwargs = super().get_form_kwargs()
return kwargs
class UpdateUserPropertyView(DashboardView, UpdateView):
template_name = "new_user_property.html"
title = _("Update User Property")
breadcrumb = "Device / Update Property"
model = UserProperty
fields = ("key", "value")
def form_valid(self, form):
form.instance.owner = self.request.user.institution
form.instance.user = self.request.user
form.instance.type = Property.Type.USER
response = super().form_valid(form)
messages.success(self.request, _("User property updated successfully."))
return response
def get_success_url(self):
referer = self.request.META.get('HTTP_REFERER')
if referer:
return referer
else:
return reverse_lazy('device:details', args=[self.object.device.pk])
def get_form_kwargs(self):
pk = self.kwargs.get('pk')
user_property = get_object_or_404(UserProperty, pk=pk, owner=self.request.user.institution)
self.annotation = SystemProperty.objects.filter(
owner=self.request.user.institution,
uuid=user_property.uuid,
type=Property.Type.SYSTEM
).first()
if not self.annotation:
raise Http404
kwargs = super().get_form_kwargs()
kwargs['instance'] = user_property
return kwargs
class DeleteUserPropertyView(DashboardView, DeleteView):
model = UserProperty