Did some work on searching, changed object presentation to specialise on each row...

[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 db5de2e..cbd2525 100644 (file)
--- a/src/mewa/slot-presentations.lisp
+++ b/src/mewa/slot-presentations.lisp
@@ -82,9 +82,12 @@ When T, only the default value for primary keys and the joins are updated."))
         ifFormat       :    \"%m/%d/%Y\",
       });" input-id))))))
 
+
+
 (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))
 
 (defaction search-records ((slot mewa-relation-slot-presentation) instance)
@@ -92,7 +95,7 @@ When T, only the default value for primary keys and the joins are updated."))
       (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
@@ -104,15 +107,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)))))
 
-(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) 
-            (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)))))
+      
 
 (defmethod present-relation ((slot mewa-relation-slot-presentation) instance)
  ;;;;(<:as-html (slot-name slot) "=> " (foreign-instance slot) " from " instance )
@@ -143,18 +159,22 @@ When T, only the default value for primary keys and the joins are updated."))
   (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))))
-  
   (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)))
@@ -168,7 +188,6 @@ 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))
 
-
 (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)
@@ -181,7 +200,7 @@ When T, only the default value for primary keys and the joins are updated."))
     (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)
@@ -267,3 +286,16 @@ 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 "--"))))
+
+(defslot-presentation inline-slot-presentation (mewa-relation-slot-presentation)
+  ()
+  (:type-name inline))
+
+(defmethod present-slot ((slot inline-slot-presentation) instance)
+  (<:fieldset 
+   (<:legend (<:as-html (label slot)))
+  (<ucw:render-component :component (mewa:make-presentation (meta-model::explode-foreign-key instance (slot-name slot)) :type :editor))))
+
+(defmethod mewa::present-slot-as-row ((self mewa::mewa-object-presentation) (slot inline-slot-presentation))
+  (<:td :colspan 2
+       (present-slot slot (instance self))))
\ No newline at end of file