enhanced has-many presentations to include adding new items

darcs-hash:20050620182110-39164-78bd549052c63e24da985466ed55c3bb8329a899.gz

diff --git a/src/mewa/slot-presentations.lisp b/src/mewa/slot-presentations.lisp
index 7a6671e..6e46f0d 100644 (file)
--- a/src/mewa/slot-presentations.lisp
+++ b/src/mewa/slot-presentations.lisp
@@ -82,18 +82,10 @@
                :initargs (list 
                           :global-properties 
                           (list :editablep nil :linkedp nil)))))
                :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 instance) (<: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 (ucw::parent slot) 
+       (setf (component.place pres) (component.place (ucw::parent slot))))
+      (when i (<ucw:render-component :component pres))))
+      ))

 
 
 
 
 
 


@@ -108,24 +100,56 @@
 (defaction view-instance ((self component) instance &rest initargs)
   (call-component (parent self) (apply #'mewa:make-presentation instance initargs)))
 
 (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))
 
 
 ;;;; 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)))
+((jci (get-join-class-info slot instance))
+        (class (first jci))
+        (home (second jci))
+        (foreign (third jci)))
+
+(defaction add-to-has-many ((slot has-many-slot-presentation) instance)
+  (destructuring-bind (class home foreign) 
+      (maxwell-web-gui::multiple-value-funcall #'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)
+      (call-component (parent slot) (mewa:make-presentation new :type :editor)))))
+

 (defmethod present-slot ((slot has-many-slot-presentation) instance)
 (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)))
   (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)
 
 
 (defmethod get-foreign-instances ((slot has-many-slot-presentation) instance)

diff --git a/src/packages.lisp b/src/packages.lisp
index aaa6944..267ca22 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -31,12 +31,29 @@
    :explode-foreign-key
    :list-has-many
    :list-many-to-many
    :explode-foreign-key
    :list-has-many
    :list-many-to-many

-   :sync-instance))
+   :sync-instance
+   :explode-has-many))

 
 
 (defpackage :mewa 
   (:use :ucw :common-lisp)
 
 
 (defpackage :mewa 
   (:use :ucw :common-lisp)

-  (:export :mewa :mewa-object-presentation :mewa-one-line-presentation :find-attribute :set-default-attributes :make-presentation :call-presentation :label :set-attribute :find-class-attributes :default-attributes :ok))
+  (:export 
+   :mewa 
+   :mewa-object-presentation 
+   :mewa-one-line-presentation 
+   :find-attribute 
+   :set-default-attributes 
+   :make-presentation 
+   :call-presentation 
+   :label 
+   :set-attribute 
+   :find-class-attributes 
+   :default-attributes 
+   :ok
+   :edit-instance
+   :save-instance
+   :cancel-save-instance
+   :global-properties))

 
 
 (defpackage :lisp-on-lines
 
 
 (defpackage :lisp-on-lines