Patches sent from Vladimir Sekissov <svg@surnet.ru> applied manually

[clinton/lisp-on-lines.git] / src / mewa / slot-presentations.lisp

diff --git a/src/mewa/slot-presentations.lisp b/src/mewa/slot-presentations.lisp
index 3df3e1b..26a3332 100644 (file)
--- a/src/mewa/slot-presentations.lisp
+++ b/src/mewa/slot-presentations.lisp
@@ -1,5 +1,34 @@
 (in-package :it.bese.ucw)
 
+(defun multiple-value-funcall->list (function &rest args)
+                  (multiple-value-call #'list (apply function args)))
+
+(defmacro multiple-value-bindf (vars form &body body)
+                  `(destructuring-bind ,vars 
+                    (multiple-value-funcall->list #',(car form) ,@(cdr form))
+                    ,@body))
+
+(defslot-presentation mewa-boolean-slot-presentation (boolean-slot-presentation)
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-boolean))
+
+(defslot-presentation mewa-string-slot-presentation (string-slot-presentation   )
+
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-string))
+
+(defslot-presentation mewa-number-slot-presentation (number-slot-presentation)
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-number))
+
+(defslot-presentation mewa-integer-slot-presentation (integer-slot-presentation)
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-integer))
+
+(defslot-presentation mewa-currency-slot-presentation (currency-slot-presentation)
+
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-currency))
 
 (defslot-presentation clsql-wall-time-slot-presentation (mewa-relation-slot-presentation)
        ()
@@ -42,6 +71,30 @@
    (linkedp :accessor linkedp :initarg :linkedp :initform t))
   (:type-name relation))
 
+(defun get-fkey-data (instance slot-name)
+  "ugly workaround b/c UCW does not like M-V-B"
+  (multiple-value-bind (finstance foreign-slot-name)
+      (meta-model:explode-foreign-key instance slot-name)
+    (cons finstance foreign-slot-name)))
+
+(defaction search-records ((slot mewa-relation-slot-presentation) instance)
+  (let* ((d (get-fkey-data instance (slot-name slot)))
+        (finstance (car d))
+        (foreign-slot-name (cdr d))
+        (new-instance
+    (call-component 
+     (parent slot) 
+     (make-instance (or (cadr (mewa:find-attribute finstance :presentation-search))
+                        'mewa::mewa-presentation-search)
+                   :search-presentation
+                   (mewa:make-presentation finstance 
+                                           :type :search-presentation)
+                   :list-presentation 
+                   (mewa:make-presentation finstance 
+                                           :type :listing)))))
+    (setf (slot-value instance (slot-name slot)) (slot-value new-instance foreign-slot-name))
+    (meta-model:sync-instance instance)))
+    
 (defmethod present-relation ((slot mewa-relation-slot-presentation) instance)
  ;;;;(<:as-html (slot-name slot) "=> " (foreign-instance slot) " from " instance )
   (let* ((i (foreign-instance slot))
@@ -51,18 +104,11 @@
                :initargs (list 
                           :global-properties 
                           (list :editablep nil :linkedp nil)))))
-      (when (ucw::parent slot) (setf (component.place pres) (component.place (ucw::parent slot))))
-      (flet ((render () (when i (<ucw:render-component :component pres))))
-      (cond 
-       ((editablep slot)
-        (render)
-        (<ucw:a :action (search-records slot i) (<:as-html " (search)"))
-        (<ucw:a :action (create-record slot i) (<:as-html " (new)")))
-       ((linkedp slot)
-        (<ucw:a :action (view-instance slot i) 
-                (render)))
-       (t       
-        (render))))))
+      (when (and (ucw::parent slot) (slot-boundp slot 'ucw::place))
+       (setf (component.place pres) (component.place (ucw::parent slot))))
+      (when i (<ucw:render-component :component pres))))
+
+
 
 (defmethod present-slot ((slot mewa-relation-slot-presentation) instance)
   (present-relation slot instance))
@@ -75,24 +121,52 @@
 (defaction view-instance ((self component) instance &rest initargs)
   (call-component (parent self) (apply #'mewa:make-presentation instance initargs)))
 
-(defmethod  present-slot :before ((slot foreign-key-slot-presentation) instance)
-  (setf (foreign-instance slot) (meta-model:explode-foreign-key instance (slot-name slot))))
+
+(defmethod  present-slot :around ((slot foreign-key-slot-presentation) instance)
+  (setf (foreign-instance slot) (when (presentation-slot-value slot instance) (meta-model:explode-foreign-key instance (slot-name slot))))
+  (flet ((render () (call-next-method)))
+    (cond 
+      ((editablep slot)
+       (render)
+       (<ucw:a :action (search-records slot instance) (<:as-html " (search)"))
+       (<ucw:a :action (create-record slot instance) (<:as-html " (new)")))
+      ((linkedp slot)
+       (<ucw:a :action (view-instance slot (foreign-instance slot)) 
+              (render)))
+      (t       
+       (render)))))
 
 ;;;; HAS MANY 
 (defslot-presentation has-many-slot-presentation (mewa-relation-slot-presentation)
   ()
   (:type-name has-many))
 
+
+(defun get-join-class-info (slot instance)
+  "hack around m-v-b"
+  (multiple-value-bind (s h f) (meta-model:explode-has-many instance (slot-name slot))
+    (list s h f)))
+
+(defaction add-to-has-many ((slot has-many-slot-presentation) instance)
+  (destructuring-bind (class home foreign) 
+      (multiple-value-funcall->list #'meta-model:explode-has-many instance (slot-name slot))
+    (let ((new (make-instance class)))
+      (setf (slot-value new foreign) (slot-value instance home))
+      (meta-model:sync-instance new :fill-gaps-only t)
+      (call-component (parent slot) (mewa:make-presentation new :type :editor)))))
+
 (defmethod present-slot ((slot has-many-slot-presentation) instance)
+  (<ucw:a :action (add-to-has-many slot instance) 
+         (<:as-html "(add new)"))
   (let ((i (get-foreign-instances slot instance))
        (linkedp (linkedp slot)))
-  (<:ul 
-   (dolist (s i)
-     (let ((s s))
-     (setf (foreign-instance slot) s)
-     (<ucw:a :action (view-instance slot s :initargs `(:global-properties ,(list :linkedp t :editablep nil)))
-     (<:li   (setf (linkedp slot) nil)
-            (present-relation slot instance))))))))
+    (<:ul 
+     (dolist (s i)
+       (let ((s s))
+        (setf (foreign-instance slot) s)
+        (<ucw:a :action (view-instance slot s :initargs `(:global-properties ,(list :linkedp t :editablep nil)))
+                (<:li   (setf (linkedp slot) nil)
+                        (present-relation slot instance))))))))
 
 
 (defmethod get-foreign-instances ((slot has-many-slot-presentation) instance)