From cff4e1139bd19ba9dd5951788d481c662973203e Mon Sep 17 00:00:00 2001
From: Josha von Gizycki <josha.von.gizycki@triology.de>
Date: Wed, 10 Oct 2018 09:44:15 +0200
Subject: [PATCH] fix handling of mandatory required attribute on attribute

---
 src/wanijo/attribute/domain.clj | 3 +--
 src/wanijo/attribute/routes.clj | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/wanijo/attribute/domain.clj b/src/wanijo/attribute/domain.clj
index d8fedba..4ab6625 100644
--- a/src/wanijo/attribute/domain.clj
+++ b/src/wanijo/attribute/domain.clj
@@ -63,8 +63,7 @@
 (defn edit! [attr]
   (neo4j/exec-query!
    edit
-   (update attr
-           :required #(if (some? %) 1 0))))
+   attr))
 
 (neo4j/defquery delete-by-uuid
   "MATCH (a:attribute)-[c]-()
diff --git a/src/wanijo/attribute/routes.clj b/src/wanijo/attribute/routes.clj
index 9630cd5..43b0b58 100644
--- a/src/wanijo/attribute/routes.clj
+++ b/src/wanijo/attribute/routes.clj
@@ -12,8 +12,8 @@
   (let [schema-uuid (get-in req [:params :schema])]
     (if (form/valid? view-schema/attr-form req)
       (do
-        (domain/create-new! (merge {:required 0}
-                                   (:params req))
+        (domain/create-new! (form/form-data view-schema/attr-form
+                                            req)
                             schema-uuid
                             (get-in req [:session :uuid]))
         (resp/redirect (path :schema-show {:uuid schema-uuid})))
@@ -22,7 +22,7 @@
 (defn edit! [schema-uuid req]
   (if (form/valid? view-schema/attr-form req)
     (do
-      (domain/edit! (:params req))
+      (domain/edit! (form/form-data view-schema/attr-form req))
       (resp/redirect (path :schema-show {:uuid schema-uuid})))
     (routes-schema/view! schema-uuid req)))