Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.90.2.5 -r1.90.2.6
--- openacs-4/packages/xowiki/tcl/link-procs.tcl 13 Nov 2014 18:24:36 -0000 1.90.2.5
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl 12 Dec 2014 08:33:23 -0000 1.90.2.6
@@ -270,7 +270,7 @@
if {[my exists geometry]} {append link "?geometry=[my set geometry]"}
set label [string map [list ' "'"] $label]
if {[my exists href]} {set href [my set href]} {set href ""}
- set cls [my mk_css_class_and_id -default [expr {$href ne "" ? "image" : "refused-link"}]]
+ set cls [my mk_css_class_and_id -default [expr {$link ne "" ? "image" : "refused-link"}]]
if {$href ne ""} {
set href [my set href]
if {[string match "java*" $href]} {set href .}
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.472.2.26 -r1.472.2.27
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 9 Dec 2014 09:33:05 -0000 1.472.2.26
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 12 Dec 2014 08:33:23 -0000 1.472.2.27
@@ -43,7 +43,7 @@
-spec user_id
} \
-extend_slot {title -required false} \
- -extend_slot {description -spec "textarea,cols=80,rows=2"} \
+ -extend_slot {description -spec "textarea,cols=80,rows=2,label=#xowiki.Page-description#"} \
-extend_slot {text -spec "richtext"} \
-extend_slot {publish_date -spec "date"} \
-parameter {
@@ -1684,7 +1684,7 @@
-parent_id $parent_id \
$(link)]
}
- #my msg "link '$(link)' => [array get {}]"
+ #my log "link '$(link)' => [array get {}]"
if {$label eq $arg} {set label $(link)}
set item_name [string trimleft $(prefix):$(stripped_name) :]
@@ -3082,7 +3082,7 @@
} {
array set tcl_op {= eq < < > > >= >= <= <=}
array set sql_op {= = < < > > >= >= <= <=}
- array set op_map {contains,sql {$lhs_var like '%$rhs%'} contains,tcl {[lsearch $lhs_var {$rhs}] > -1}}
+ array set op_map {contains,sql {$lhs_var like '%$rhs%'} contains,tcl {{$rhs} in $lhs_var}}
#my msg unless=$unless
#example for unless: wf_current_state = closed|accepted || x = 1
set tcl_clause [list]
Index: openacs-4/packages/xowiki/www/admin/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/Attic/test.tcl,v
diff -u -r1.36.2.4 -r1.36.2.5
--- openacs-4/packages/xowiki/www/admin/test.tcl 3 Sep 2014 14:33:29 -0000 1.36.2.4
+++ openacs-4/packages/xowiki/www/admin/test.tcl 12 Dec 2014 08:33:23 -0000 1.36.2.5
@@ -7,10 +7,10 @@
test proc section msg {my reset; ns_write "
$msg
"}
test proc subsection msg {ns_write "$msg
"}
test proc subsubsection msg {ns_write "$msg
"}
-test proc errmsg msg {my code "ERROR: [string map [list < {<} > {>}] $msg]
";test incr failed}
-test proc okmsg msg {ns_write "OK: $msg
"; test incr passed}
+test proc errmsg msg {my code "ERROR: [string map [list < {<} > {>}] $msg]
";test incr failed}
+test proc okmsg msg {ns_write "OK: $msg
"; test incr passed}
test proc code msg {ns_write "$msg
"}
-test proc hint msg {ns_write "$msg
"}
+test proc hint msg {ns_write "$msg
"}
test proc reset {} {
array unset ::xotcl_cleanup
global af_parts af_key_name
@@ -556,6 +556,7 @@
item_id $returned_item_id }]
set content [test without_ns_form {::$package_id invoke -method $m}]
+
? {string first Error $content} -1 "page contains no error"
? {::xo::cc exists __continuation} 1 "continuation exists"
? {::xo::cc set __continuation} "ad_returnredirect /$instance_name/hello" \
@@ -656,27 +657,27 @@
####################################
? {::xowiki::FormPage filter_expression \
- "_state=created|accepted|approved|tested|developed|deployed&&_assignee=123" &&} \
+ "_state=created|accepted|approved|tested|developed|deployed&&_assignee=123" &&} \
{tcl {[lsearch -exact {created accepted approved tested developed deployed} [my property _state]] > -1&&[my property _assignee] eq {123}} h {} vars {} sql {{state in ('created','accepted','approved','tested','developed','deployed')} {assignee = '123'}}} filter_expr_where_1
? {::xowiki::FormPage filter_expression \
- "_assignee<=123 && y>=123" &&} \
- {tcl {[my property _assignee] <= {123}&&$__ia(y) >= {123}} h {} vars {y {}} sql {{assignee <= '123'}}} \
+ "_assignee<=123 && y>=123" &&} \
+ {tcl {[my property _assignee] <= {123}&&[dict get $__ia y] >= {123}} h {} vars {y {}} sql {{assignee <= '123'}}} \
filter_expr_where_2
? {::xowiki::FormPage filter_expression \
- "betreuer contains en:person1" &&} \
- {tcl {[lsearch $__ia(betreuer) {en:person1}] > -1} h {} vars {betreuer {}} sql {{instance_attributes like '%en:person1%'}}} \
+ "betreuer contains en:person1" &&} \
+ {tcl {{en:person1} in [dict get $__ia betreuer]} h {} vars {betreuer {}} sql {{instance_attributes like '%en:person1%'}}} \
filter_expr_where_3
? {::xowiki::FormPage filter_expression \
- "_state=closed" ||} \
+ "_state=closed" ||} \
{tcl {[my property _state] eq {closed}} h {} vars {} sql {{state = 'closed'}}} \
filter_expr_unless_1
? {::xowiki::FormPage filter_expression \
"_state= closed|accepted || x = 1" ||} \
- {tcl {[lsearch -exact {closed accepted} [my property _state]] > -1||$__ia(x) eq {1}} h x=>1 vars {x {}} sql {{state in ('closed','accepted')}}} \
+ {tcl {[lsearch -exact {closed accepted} [my property _state]] > -1||[dict get $__ia x] eq {1}} h x=>1 vars {x {}} sql {{state in ('closed','accepted')}}} \
filter_expr_unless_1