(multiple-value-funcall->list #',(car form) ,@(cdr form))
,@body))
+
+;;;; ** Textarea Slot Presentation
+;;;; This should really be in UCW.
+
+(defslot-presentation text-slot-presentation ()
+ ((rows :initarg :rows :accessor rows :initform nil)
+ (columns :initarg :columns :accessor columns :initform nil)
+ (html-contentp :initarg :escape-html-p :accessor escape-html-p :initform nil))
+ (:type-name text))
+
+(defmethod present-slot ((slot text-slot-presentation) instance)
+ (if (editablep slot)
+ (<ucw:textarea :accessor (presentation-slot-value slot instance)
+ :rows (rows slot)
+ :cols (columns slot))
+ (if (escape-html-p slot)
+ (<:as-is (presentation-slot-value slot instance))
+ (<:as-html (presentation-slot-value slot instance)))))
+
+
(defcomponent mewa-slot-presentation ()
((slot-name :accessor slot-name
:initarg :slot-name
:initform nil
:documentation
"When nil, the instance is syncronised with the database.
-When T, only the default value for primary keys and the joins are updated."))
+When T, only the default value for primary keys and the joins are updated.")
+ (show-label-p :accessor show-label-p :initarg :show-label-p :initform t))
(:documentation "The superclass of all Mewa slot presentations"))
;;;; this has to be in the eval when i would think
integer
currency)
-
(defslot-presentation clsql-wall-time-slot-presentation (mewa-relation-slot-presentation)
()
(:type-name clsql-sys:wall-time))
(defslot-presentation mewa-relation-slot-presentation (mewa-slot-presentation slot-presentation)
((foreign-instance :accessor foreign-instance)
- (linkedp :accessor linkedp :initarg :linkedp :initform t))
+ (linkedp :accessor linkedp :initarg :linkedp :initform t)
+ (creator :accessor creator :initarg :creator :initform :editor))
(:type-name relation))
(defaction search-records ((slot mewa-relation-slot-presentation) instance)
(meta-model:explode-foreign-key instance (slot-name slot))
(let ((new-instance
(call-component
- (parent slot)
+ (parent slot)
(make-instance (or (cadr (mewa:find-attribute finstance :presentation-search))
'mewa::mewa-presentation-search)
:search-presentation
(setf (slot-value instance (slot-name slot)) (slot-value new-instance foreign-slot-name))
(meta-model:sync-instance instance :fill-gaps-only-p (fill-gaps-only-p self)))))
-(defaction create-record ((slot mewa-relation-slot-presentation) instance)
+(defaction create-record-on-foreign-key ((slot mewa-relation-slot-presentation) instance)
(multiple-value-bindf (finstance foreign-slot-name)
(meta-model:explode-foreign-key instance (slot-name slot))
(let ((new-instance
(call-component
(parent slot)
- (mewa:make-presentation finstance :type :editor))))
+ (mewa:make-presentation finstance :type (creator self)))))
+
+ ;;;; TODO: this next bit is due to a bad design decision.
+ ;;;; Components should always have (ok) return self, but somewhere
+ ;;;; i've made in return (instance self) sometimes, and this
+ ;;;; bahaviour is totatlly fucked.
+
+ (when (typep new-instance 'mewa::mewa)
+ (setf new-instance (instance new-instance)))
+
+ ;;;; sorry about that, and now back t our regular program.
+
+ (meta-model:sync-instance new-instance)
(setf (slot-value instance (slot-name slot)) (slot-value new-instance foreign-slot-name))
(meta-model:sync-instance instance :fill-gaps-only-p (fill-gaps-only-p self)))))
+
(defmethod present-relation ((slot mewa-relation-slot-presentation) instance)
;;;;(<:as-html (slot-name slot) "=> " (foreign-instance slot) " from " instance )
(meta-model:sync-instance (instance (parent self))))
-(defmethod present-slot :around ((slot foreign-key-slot-presentation) instance)
+
+(defmethod present-slot :before ((slot foreign-key-slot-presentation) instance)
+ ())
+
+
+(defmethod present-slot :around ((slot foreign-key-slot-presentation) instance)
(setf (foreign-instance slot)
(when (presentation-slot-value slot instance)
(meta-model:explode-foreign-key instance (slot-name slot))))
-
(flet ((render () (when (foreign-instance slot)(call-next-method))))
(if (slot-boundp slot 'place)
(cond
((editablep slot)
(render)
(<ucw:submit :action (search-records slot instance) :value "Search" :style "display:inline")
- (<ucw:submit :action (create-record slot instance) :value "Add New" :style "display:inline"))
+ (<ucw:submit :action (create-record-on-foreign-key slot instance) :value "Add New" :style "display:inline"))
((linkedp slot)
(<ucw:a :action (view-instance slot (foreign-instance slot))
(render)))
((add-new-label :accessor add-new-label :initarg :add-new-label :initform "Add New"))
(:type-name has-many))
-
(defaction add-to-has-many ((slot has-many-slot-presentation) instance)
+ ;; if the instance is not stored we must make sure to mark it stored now!
+ (unless (mewa::instance-is-stored-p instance)
+ (setf (mewa::modifiedp (parent self)) t))
+ ;; sync up the instance
(mewa:ensure-instance-sync (parent slot))
+
(multiple-value-bindf (class home foreign)
(meta-model:explode-has-many instance (slot-name slot))
(let ((new (make-instance class)))
(setf (slot-value new foreign) (slot-value instance home))
(meta-model:sync-instance new :fill-gaps-only-p (fill-gaps-only-p self))
- (call-component (parent slot) (mewa:make-presentation new :type :editor))
+ (call-component (parent slot) (mewa:make-presentation new :type (creator slot)))
(meta-model:sync-instance instance))))
(defmethod present-slot ((slot has-many-slot-presentation) instance)
(setf (instance (presentation slot)) (presentation-slot-value slot instance))
(present (presentation slot)))
(<:as-html "--"))))
+
+
+
+
+
+
+
HCoop / clinton / lisp-on-lines.git / blobdiff