whole bunch of cleanups so we build

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

diff --git a/src/mewa/mewa.lisp b/src/mewa/mewa.lisp
index a264756..ba7d6d9 100644 (file)
--- a/src/mewa/mewa.lisp
+++ b/src/mewa/mewa.lisp
@@ -85,11 +85,21 @@ attributes is an alist keyed on the attribute nreeame."
 
 
 (defmethod default-attributes ((model t))
-  (append (mapcar #'(lambda (s) (cons (car s) (gen-pslot (if (meta-model:foreign-key-p model (car s))
-                                                  (cadr s))
-                                                (string (car s)) (car s)))) 
-         (meta-model:list-slot-types model))
-         (mapcar #'(lambda (s) (cons s (append (gen-pslot 'ucw::has-many (string s) s) `(:presentation (make-presentation ,model :type :one-line)))))
+  "return the default attributes for a given model using the meta-model's meta-data"
+  (append (mapcar #'(lambda (s) 
+                     (cons (car s) 
+                           (gen-pslot 
+                            (if (meta-model:foreign-key-p model (car s))
+                                'ucw::foreign-key
+                                (cadr s))
+                            (string (car s)) (car s)))) 
+                 (meta-model:list-slot-types model))
+         (mapcar #'(lambda (s) 
+                     (cons s (append (gen-pslot 'ucw::has-many (string s) s) 
+                                     `(:presentation 
+                                       (make-presentation 
+                                        ,model 
+                                        :type :one-line)))))
                  (meta-model:list-has-many model))))
 
 (defmethod set-default-attributes ((model t))
@@ -263,10 +273,14 @@ attributes is an alist keyed on the attribute nreeame."
 
 
 (defaction cancel-save-instance ((self mewa))
-  (answer nil))
+  (cond  
+    ((slot-value (instance self) 'clsql-sys::view-database)
+      (meta-model::update-instance-from-records (instance self))
+      (answer self))
+    (t (answer nil))))
 
 (defaction save-instance ((self mewa))
-  (meta-modqel:sync-instance (instance self))
+  (meta-model:sync-instance (instance self))
    (setf (modifiedp self) nil)
        (answer self))