fixed layer ordering.

darcs-hash:20060108005900-5417e-08d2f85fac819517333b4eb0a7a966027d30a374.gz

diff --git a/src/relational-attributes.lisp b/src/relational-attributes.lisp
index 550082e..5485515 100644 (file)
--- a/src/relational-attributes.lisp
+++ b/src/relational-attributes.lisp
@@ -15,11 +15,11 @@
 
 
 (defdisplay (:description (attribute many-to-many))
 
 
 (defdisplay (:description (attribute many-to-many))

-    (let ((instances (select-instances object))
+  (let ((instances (select-instances object t))

        new-instance)
     (<:ul
      (<:li (<ucw:button :action (add-new-relation component object (getp slot-name))
        new-instance)
     (<:ul
      (<:li (<ucw:button :action (add-new-relation component object (getp slot-name))

-                        (<:as-html "Add New")))
+                       (<:as-html "Add New")))

      (<:li  (<ucw:button :action (add-new-relation component object new-instance)
                         (<:as-html "Add:"))
            (<ucw:select :accessor new-instance
      (<:li  (<ucw:button :action (add-new-relation component object new-instance)
                         (<:as-html "Add:"))
            (<ucw:select :accessor new-instance

diff --git a/src/standard-display.lisp b/src/standard-display.lisp
index c9f8fcb..2a72992 100644 (file)
--- a/src/standard-display.lisp
+++ b/src/standard-display.lisp
@@ -103,7 +103,7 @@
  default action is to FUNCALL-WITH-LAYERS the DISPLAY-USING-DESCRIPTION method."))
 
 (define-layered-method display
  default action is to FUNCALL-WITH-LAYERS the DISPLAY-USING-DESCRIPTION method."))
 
 (define-layered-method display

-  ((component t) (object standard-object) &rest args &key layers (type 'viewer)  &allow-other-keys)  
+  ((component t) (object t) &rest args &key layers (type 'viewer)  &allow-other-keys)  

   (let* ((occurence (find-occurence object))
         (plist (attribute.plist
                 (find-attribute occurence (intern (format nil "~A" type) :KEYWORD))))
   (let* ((occurence (find-occurence object))
         (plist (attribute.plist
                 (find-attribute occurence (intern (format nil "~A" type) :KEYWORD))))


@@ -117,7 +117,7 @@
 
 
 (define-layered-method display
 
 
 (define-layered-method display

-  ((component t) (object t) &rest args &key (layers  '(+ viewer)) &allow-other-keys)
+  ((component t) (object t) &rest args &key layers (type 'viewer) &allow-other-keys)

   (funcall-with-layers 
    layers               
    #'display-using-description  t component object args))
   (funcall-with-layers 
    layers               
    #'display-using-description  t component object args))