X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/233380f7937e342cb0a0027f352aecf05f0ae2a4..46cea8c8b169e593c5ce68dfcfcbb68b7c637444:/src/mewa/mewa.lisp

diff --git a/src/mewa/mewa.lisp b/src/mewa/mewa.lisp
index 01b3577..70cce96 100644
--- a/src/mewa/mewa.lisp
+++ b/src/mewa/mewa.lisp
@@ -65,6 +65,9 @@ attributes is an alist keyed on the attribute nreeame."
 (defmethod find-class-attributes ((model symbol))
   (find-or-create-attributes model))
 
+(defmethod clear-class-attributes ((model t))
+  (setf (cdr (find-class-attributes model)) nil))
+
 (defmethod add-attribute ((model t) name def)
   (let ((map (find-class-attributes model)))
     (setf (cdr map) (acons name def (cdr map)))))
@@ -90,6 +93,9 @@ attributes is an alist keyed on the attribute nreeame."
 			 (cddr (find-attribute model name))))
 	    definition)))
 
+(defmethod perform-set-attributes ((model t) definitions)
+  (dolist (def definitions)
+    (funcall #'set-attribute model (first def) (rest def))))
 
 (defmethod default-attributes ((model t))
   "return the default attributes for a given model using the meta-model's meta-data"
@@ -110,6 +116,7 @@ attributes is an alist keyed on the attribute nreeame."
 		  (meta-model:list-has-many model))))
 
 (defmethod set-default-attributes ((model t))
+  (clear-class-attributes model)
   (mapcar #'(lambda (x) 
 	      (setf (find-attribute model (car x)) (cdr x)))
 	  (default-attributes model)))
@@ -278,6 +285,12 @@ attributes is an alist keyed on the attribute nreeame."
   `(present-object ,object :presentation (make-presentation ,object ,@args)))
 
 
+(defcomponent about-dialog (option-dialog)
+  ((body :initarg :body)))
+
+(defmethod render-on ((res response) (self about-dialog))
+  (render-on res (slot-value self 'body))
+  (call-next-method))
 
 (defaction cancel-save-instance ((self mewa))
   (cond  
@@ -292,23 +305,30 @@ attributes is an alist keyed on the attribute nreeame."
        (answer self))
 
 
-(defaction ok ((self mewa) &optional arg)
-  "Returns the component if it has not been modified. if it has been, prompt user to save or cancel"
-  (declare (ignore arg))
+(defaction ensure-instance-sync ((self mewa))
   (when (modifiedp self)
     (let ((message (format nil "Record has been modified, Do you wish to save the changes?<br/> ~a" (print (modifications self)))))
-      (case (call 'option-dialog 
+      (case (call 'about-dialog
+                  :body (make-presentation (instance self) 
+					   :type :viewer)
 		  :message message
 		  :options '((:save . "Save changes to Database")
 			     (:cancel . "Cancel all changes")))
 	(:cancel
 	 (cancel-save-instance self))
 	(:save 
-	 (save-instance self)))))
+	 (save-instance self))))))
+
+(defaction ok ((self mewa) &optional arg)
+  "Returns the component if it has not been modified. if it has been, prompt user to save or cancel"
+  (declare (ignore arg))
+  (ensure-instance-sync self)
   (answer self))
 
 
 
+
+
 (defmethod (setf presentation-slot-value) :around (value (slot slot-presentation) instance)
   (let* ((old (prog1 
 		 (presentation-slot-value slot instance)
@@ -318,7 +338,7 @@ attributes is an alist keyed on the attribute nreeame."
   (unless (equal new old )
     (let ((self (ucw::parent slot)))
       (setf (modifiedp self) instance
-	    (modifications self)  (append (list  (type-of new) (type-of old) (type-of value) slot instance )))))))
+	    (modifications self)  (append (list new old value slot instance) (modifications self)))))))
 
 
 ;; This software is Copyright (c) Drew Crampsie, 2004-2005.