explode-foreign-key now returns an empty instance if the key is NIL. also, as a secon...

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

diff --git a/src/mewa/presentations.lisp b/src/mewa/presentations.lisp
index 3763c27..0ec34ee 100644 (file)
--- a/src/mewa/presentations.lisp
+++ b/src/mewa/presentations.lisp
@@ -11,9 +11,29 @@
 ;;;objects
 (defcomponent mewa-object-presentation (mewa ucw:object-presentation) ())
 
+(defcomponent two-column-presentation (mewa-object-presentation) ())
+
+(defmethod present ((pres two-column-presentation))
+  
+  (<:table :class (css-class pres)
+          (loop for slot on (slots pres) by #'cddr
+                do 
+                (<:tr :class "presentation-slot-row"
+                      (<:td :class "presentation-slot-label" 
+                            (<:as-html (label (first slot))))
+                      (<:td :class "presentation-slot-value" 
+                            (present-slot (first slot) (instance pres)))
+                      (when (second slot)
+                        (<:td :class "presentation-slot-label" 
+                              (<:as-html (label (second slot))))
+                        (<:td :class "presentation-slot-value" 
+                              (present-slot (second slot) (instance pres))))))
+          (render-options pres (instance pres))))
+
+
 ;;;lists
 (defcomponent mewa-list-presentation (mewa ucw:list-presentation) 
-  ((instances :accessor instances :initarg :instances :initform nil)
+  ((ucw::instances :accessor instances :initarg :instances :initform nil)
    (instance :accessor instance)
    (select-label :accessor select-label :initform "select" :initarg :select-label)
    (selectablep :accessor selectablep :initform t :initarg :selectablep)))
@@ -42,8 +62,7 @@
                      :value (select-label listing)))))
     (dolist (slot (slots listing))
       (<:td :class "data-cell" (present-slot slot object)))
-    (<:td :class "index-number-cell"
-      (<:i (<:as-html index)))
+    (<:td :class "index-number-cell")
     ))
 
 (defmethod get-all-instances ((self mewa-list-presentation))