(defslot-presentation text-slot-presentation ()
((rows :initarg :rows :accessor rows :initform 5)
(columns :initarg :columns :accessor columns :initform 40)
- (escape-html-p :initarg :escape-html-p :accessor escape-html-p :initform nil))
+ (escape-html-p :initarg :escape-html-p :accessor escape-html-p :initform nil)
+ (convert-newlines-p :initarg :convert-newlines-p :accessor convert-newlines-p :initform nil))
(:type-name text))
(defmethod present-slot ((slot text-slot-presentation) instance)
+ (flet ((maybe-convert-newline-and-escape-html-then-print ()
+ (let ((string (if (convert-newlines-p slot)
+ (with-output-to-string (new-string)
+ (with-input-from-string
+ (s (presentation-slot-value slot instance))
+ (loop for line = (read-line s nil)
+ while line
+ do (format new-string "~A~A" line "<br/>"))))
+ (presentation-slot-value slot instance))))
+ (if (escape-html-p slot)
+ (<:as-html string)
+ (<:as-is string)))))
+
(if (editablep slot)
(<ucw:textarea
:accessor (presentation-slot-value slot instance)
"")
:rows (rows slot)
:cols (columns slot))
- (if (escape-html-p slot)
- (<:as-html (presentation-slot-value slot instance))
- (<:as-is (presentation-slot-value slot instance)))))
+ (maybe-convert-newline-and-escape-html-then-print))))
(defcomponent mewa-slot-presentation ()
(defslot-presentation clsql-wall-time-slot-presentation (mewa-relation-slot-presentation)
((input-id :accessor input-id :initform (arnesi:random-string 10 arnesi:+ascii-alphabet+))
- (trigger-id :accessor trigger-id :initform (arnesi:random-string 10 arnesi:+ascii-alphabet+)))
+ (trigger-id :accessor trigger-id :initform (arnesi:random-string 10 arnesi:+ascii-alphabet+))
+ (default-to-now-p :accessor default-to-now-p :initarg :default-to-now-p :initform nil))
(:type-name clsql-sys:wall-time))
(defmethod presentation-slot-value ((slot clsql-wall-time-slot-presentation) instance)
(unless (or (eql old-time new-time)
(when (and new-time old-time)
(equal :equal (clsql:time-compare new-time old-time))))
- (setf (presentation-slot-value slot instance) new-time ))))
+ (setf (presentation-slot-value slot instance) new-time))))
(defmethod label :around ((slot clsql-wall-time-slot-presentation))
(concatenate 'string (call-next-method) " (m/d/y)"))
(defmethod present-slot ((slot clsql-wall-time-slot-presentation) instance)
(let ((date (presentation-slot-value slot instance)))
+ ;; Default values
+ (when (and (not date) (default-to-now-p slot))
+ (setf (presentation-slot-value slot instance) (clsql:get-time)))
+ ;;simple viewer
(if (and date (not (editablep slot)))
(<:as-html date))
+ ;; editor
(when (editablep slot)
(<ucw:input :accessor (presentation-slot-value slot instance) :id (input-id slot) :style "display:inline")
(<:button :id (trigger-id slot) (<:as-html "[...]"))