From b890d44942859c366cac60a84b6c19363d321aaf Mon Sep 17 00:00:00 2001
From: Drew Crampsie <drewc@tech.coop>
Date: Thu, 27 Oct 2005 15:28:42 -0700
Subject: [PATCH] made the *-view macros actually work as intended

darcs-hash:20051027222842-5417e-63b09563426cdd1af3c5d0a917744ccdfcdbe430.gz
---
 src/lisp-on-lines.lisp | 47 ++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/lisp-on-lines.lisp b/src/lisp-on-lines.lisp
index 465ec5f..77dab5c 100644
--- a/src/lisp-on-lines.lisp
+++ b/src/lisp-on-lines.lisp
@@ -30,33 +30,38 @@ This involves creating a meta-model, a clsql view-class, and the setting up the
   `(define-view-for-table ,@(meta-model::list-tables)))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun %make-view (object type &rest attributes-and-args)
-    (let ((attributes (car attributes-and-args))
-	  (args (cdr attributes-and-args)))
+  (defun %make-view (object type attributes args)
+   
+      (when attributes
+	(setf args
+	      (cons `(:attributes ,attributes) args)))
       `(mewa:make-presentation
 	,object
 	:type ,type
-	:initargs
-	'(,@ (when attributes
-	       `(:attributes ,attributes))) 
-	,@args)))) 
+	,@(when args
+		`(:initargs
+		  '(,@ (mapcan #'identity args)))))))
 
 (defmethod make-view (object &rest args &key (type :viewer) (attributes nil)
 		      &allow-other-keys )
-  (apply #'make-presentation (cdr (%make-view object type (cons attributes args)))))
+  (apply #'make-presentation (cdr (%make-view object type attributes args))))
 
-(defmacro present-view ((object &optional (type :viewer))
+(defmacro present-view ((object &optional (type :viewer) (parent 'self))
 			&body attributes-and-args)
-  `(present ,(%make-view object type attributes-and-args)))
+  (arnesi:with-unique-names (view)
+    `(let ((,view (lol:make-view ,object
+				 :type ,type
+				 :attributes ,(car attributes-and-args)
+				 ,@ (cdr attributes-and-args))))
+      (setf (ucw::parent ,view) ,parent)
+      (lol:present ,view))))
 
 
 (defmacro call-view ((object &optional (type :viewer) (component 'self component-supplied-p))
-		     &body attributes-and-args)
-  
-  
+		     &body attributes-and-args)  
   `(ucw:call-component
     ,component
-    ,(%make-view object type attributes-and-args)))
+    ,(%make-view object type (car attributes-and-args) (cdr attributes-and-args))))
 
 (defmethod slot-view ((self mewa) slot-name)
   (mewa::find-attribute-slot self slot-name))
@@ -65,8 +70,6 @@ This involves creating a meta-model, a clsql view-class, and the setting up the
   (present-slot (slot-view self slot-name) instance))
 
 
-
-
 (defmethod find-slots-of-type (model &key (type 'string)
 			      (types '((string)) types-supplied-p))
   "returns a list of slots matching TYPE, or matching any of TYPES"
@@ -79,6 +82,16 @@ This involves creating a meta-model, a clsql view-class, and the setting up the
 	     (lisp-on-lines::list-slot-types model)))))
 
 
+
+(defun %delete-item (item)
+  (ignore-errors
+    (clsql:delete-instance-records item)))
+
+(defaction delete-item ((self component) instance)
+  (if (%delete-item instance)
+      (answer nil)
+      (call 'info-message :message "Could not remove item. Try removing associated items first.")))
+
 (defmethod word-search (class-name slots search-terms 
 			&key (limit 10) (where (sql-and t)))
   (select class-name 
@@ -104,3 +117,5 @@ This involves creating a meta-model, a clsql view-class, and the setting up the
 			      slots)))
 	   search-terms)))
 
+
+  
\ No newline at end of file
-- 
2.20.1