slot-presentation-cleanups

[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 571e9dd..2ed5b32 100644 (file)
--- a/src/mewa/slot-presentations.lisp
+++ b/src/mewa/slot-presentations.lisp
@@ -1,9 +1,11 @@
 (in-package :it.bese.ucw)
 
 (defun multiple-value-funcall->list (function &rest args)
 (in-package :it.bese.ucw)
 
 (defun multiple-value-funcall->list (function &rest args)

+  "The function to be called by m-v-bf"

                   (multiple-value-call #'list (apply function args)))
 
 (defmacro multiple-value-bindf (vars form &body body)
                   (multiple-value-call #'list (apply function args)))
 
 (defmacro multiple-value-bindf (vars form &body body)

+  "Like M-V-B, only it works in actions. form must be a function call"

                   `(destructuring-bind ,vars 
                     (multiple-value-funcall->list #',(car form) ,@(cdr form))
                     ,@body))
                   `(destructuring-bind ,vars 
                     (multiple-value-funcall->list #',(car form) ,@(cdr form))
                     ,@body))


@@ -44,7 +46,6 @@ When T, only the default value for primary keys and the joins are updated."))
   integer
   currency)
 
   integer
   currency)
 

-

 (defslot-presentation clsql-wall-time-slot-presentation (mewa-relation-slot-presentation)
        ()
        (:type-name clsql-sys:wall-time))
 (defslot-presentation clsql-wall-time-slot-presentation (mewa-relation-slot-presentation)
        ()
        (:type-name clsql-sys:wall-time))


@@ -82,21 +83,16 @@ When T, only the default value for primary keys and the joins are updated."))
 
 (defslot-presentation  mewa-relation-slot-presentation (mewa-slot-presentation slot-presentation)
   ((foreign-instance :accessor foreign-instance)
 
 (defslot-presentation  mewa-relation-slot-presentation (mewa-slot-presentation slot-presentation)
   ((foreign-instance :accessor foreign-instance)

-   (linkedp :accessor linkedp :initarg :linkedp :initform t))
+   (linkedp :accessor linkedp :initarg :linkedp :initform t)
+   (creator :accessor creator :initarg :creator :initform :editor))

   (:type-name relation))
 
   (: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)
   (multiple-value-bindf (finstance foreign-slot-name)
       (meta-model:explode-foreign-key instance (slot-name slot))
     (let ((new-instance
             (call-component 
 (defaction search-records ((slot mewa-relation-slot-presentation) instance)
   (multiple-value-bindf (finstance foreign-slot-name)
       (meta-model:explode-foreign-key instance (slot-name slot))
     (let ((new-instance
             (call-component 

-             (parent slot) 
+             (parent slot)

              (make-instance (or (cadr (mewa:find-attribute finstance :presentation-search))
                                 'mewa::mewa-presentation-search)
                             :search-presentation
              (make-instance (or (cadr (mewa:find-attribute finstance :presentation-search))
                                 'mewa::mewa-presentation-search)
                             :search-presentation


@@ -108,15 +104,28 @@ When T, only the default value for primary keys and the joins are updated."))
       (setf (slot-value instance (slot-name slot)) (slot-value new-instance foreign-slot-name))
       (meta-model:sync-instance instance :fill-gaps-only-p (fill-gaps-only-p self)))))
 
       (setf (slot-value instance (slot-name slot)) (slot-value new-instance foreign-slot-name))
       (meta-model:sync-instance instance :fill-gaps-only-p (fill-gaps-only-p self)))))
 

-(defaction create-record ((slot mewa-relation-slot-presentation) instance)
+(defaction create-record-on-foreign-key ((slot mewa-relation-slot-presentation) instance)

   (multiple-value-bindf (finstance foreign-slot-name)
       (meta-model:explode-foreign-key instance (slot-name slot))
     (let ((new-instance
            (call-component
             (parent slot) 
   (multiple-value-bindf (finstance foreign-slot-name)
       (meta-model:explode-foreign-key instance (slot-name slot))
     (let ((new-instance
            (call-component
             (parent slot) 

-            (mewa:make-presentation finstance :type :editor))))
+            (mewa:make-presentation finstance :type (creator self)))))
+      
+      ;;;; TODO: this next bit is due to a bad design decision. 
+      ;;;; Components should always have (ok) return self, but somewhere 
+      ;;;; i've made in return (instance self) sometimes, and this
+      ;;;; bahaviour is totatlly fucked.
+      
+     (when (typep new-instance 'mewa::mewa)
+       (setf new-instance (instance new-instance)))
+
+      ;;;; sorry about that, and now back t our regular program.
+      
+      (meta-model:sync-instance new-instance)

       (setf (slot-value instance (slot-name slot)) (slot-value new-instance foreign-slot-name))
       (meta-model:sync-instance instance :fill-gaps-only-p (fill-gaps-only-p self)))))
       (setf (slot-value instance (slot-name slot)) (slot-value new-instance foreign-slot-name))
       (meta-model:sync-instance instance :fill-gaps-only-p (fill-gaps-only-p self)))))

+      

 
 (defmethod present-relation ((slot mewa-relation-slot-presentation) instance)
  ;;;;(<:as-html (slot-name slot) "=> " (foreign-instance slot) " from " instance )
 
 (defmethod present-relation ((slot mewa-relation-slot-presentation) instance)
  ;;;;(<:as-html (slot-name slot) "=> " (foreign-instance slot) " from " instance )


@@ -147,18 +156,22 @@ When T, only the default value for primary keys and the joins are updated."))
   (meta-model:sync-instance (instance (parent self))))
 
 
   (meta-model:sync-instance (instance (parent self))))
 
 

-(defmethod  present-slot :around ((slot foreign-key-slot-presentation) instance)
+
+(defmethod present-slot :before ((slot foreign-key-slot-presentation) instance)
+  ())
+
+
+(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))))
   (setf (foreign-instance slot) 
        (when (presentation-slot-value slot instance) 
          (meta-model:explode-foreign-key instance (slot-name slot))))

-  

   (flet ((render () (when (foreign-instance slot)(call-next-method))))
     (if (slot-boundp slot 'place)
         (cond 
           ((editablep slot)
            (render)
            (<ucw:submit :action  (search-records slot instance) :value "Search" :style "display:inline")
   (flet ((render () (when (foreign-instance slot)(call-next-method))))
     (if (slot-boundp slot 'place)
         (cond 
           ((editablep slot)
            (render)
            (<ucw:submit :action  (search-records slot instance) :value "Search" :style "display:inline")

-           (<ucw:submit :action  (create-record slot instance) :value "Add New" :style "display:inline"))
+           (<ucw:submit :action  (create-record-on-foreign-key slot instance) :value "Add New" :style "display:inline"))

           ((linkedp slot)
            (<ucw:a :action (view-instance slot (foreign-instance slot)) 
                    (render)))
           ((linkedp slot)
            (<ucw:a :action (view-instance slot (foreign-instance slot)) 
                    (render)))


@@ -172,15 +185,19 @@ When T, only the default value for primary keys and the joins are updated."))
   ((add-new-label :accessor add-new-label :initarg :add-new-label :initform "Add New"))
   (:type-name has-many))
 
   ((add-new-label :accessor add-new-label :initarg :add-new-label :initform "Add New"))
   (:type-name has-many))
 

-

 (defaction add-to-has-many ((slot has-many-slot-presentation) instance)
 (defaction add-to-has-many ((slot has-many-slot-presentation) instance)

+  ;; if the instance is not stored we must make sure to mark it stored now!
+  (unless (mewa::instance-is-stored-p instance)
+    (setf (mewa::modifiedp (parent self)) t))
+  ;; sync up the instance

   (mewa:ensure-instance-sync (parent slot))
   (mewa:ensure-instance-sync (parent slot))

+

   (multiple-value-bindf (class home foreign) 
       (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-p (fill-gaps-only-p self))
   (multiple-value-bindf (class home foreign) 
       (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-p (fill-gaps-only-p self))

-      (call-component (parent slot) (mewa:make-presentation new :type :editor))
+      (call-component (parent slot) (mewa:make-presentation new :type (creator slot)))

       (meta-model:sync-instance instance))))
 
 (defmethod present-slot ((slot has-many-slot-presentation) instance)
       (meta-model:sync-instance instance))))
 
 (defmethod present-slot ((slot has-many-slot-presentation) instance)


@@ -266,3 +283,10 @@ When T, only the default value for primary keys and the joins are updated."))
            (setf (instance (presentation slot)) (presentation-slot-value slot instance))
            (present (presentation slot)))
          (<:as-html "--"))))
            (setf (instance (presentation slot)) (presentation-slot-value slot instance))
            (present (presentation slot)))
          (<:as-html "--"))))

+
+
+
+
+
+
+