Index: openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.2.2.28 -r1.2.2.29
--- openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml 3 May 2020 14:15:58 -0000 1.2.2.28
+++ openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml 11 May 2020 14:14:10 -0000 1.2.2.29
@@ -161,4 +161,6 @@
Randomisierung f�r Pr�fung geeignet
Randomisierung f�r Pr�fung nicht geeignet (keine Zufallsauswahl "immer" verwenden)
%achievedPoints% (gerundet %rounded%) von m�glichen %totalPoints% Punkten, %percentage%%, Note: %grade%
+
+ Name enth�lt zumindest ein ung�ltiges Zeichen
Index: openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml,v
diff -u -N -r1.2.2.26 -r1.2.2.27
--- openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml 3 May 2020 14:15:58 -0000 1.2.2.26
+++ openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml 11 May 2020 14:14:10 -0000 1.2.2.27
@@ -183,4 +183,6 @@
randomization for exam not ok ("always" should not be used)
%achievedPoints% (rounded%rounded%) of possible %totalPoints% points, %percentage%%, grade: %grade%
+
+ Name contains at least one invalid character
Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v
diff -u -N -r1.7.2.59 -r1.7.2.60
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl 3 May 2020 14:15:58 -0000 1.7.2.59
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl 11 May 2020 14:14:10 -0000 1.7.2.60
@@ -42,7 +42,18 @@
}
TestItemField set abstract 1
-
+ Class create test_item_name -superclass text \
+ -extend_slot_default validator name -ad_doc {
+ Name sanitizer for test items
+ }
+ test_item_name instproc check=name {value} {
+ set valid [regexp {^[[:alnum:]:/_-]+$} $value]
+ if {!$valid} {
+ :uplevel {set __langPkg xowf}
+ }
+ return $valid
+ }
+
###########################################################
#
# ::xowiki::formfield::test_item
Index: openacs-4/packages/xowf/www/prototypes/TestItemMC.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/Attic/TestItemMC.form.page,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowf/www/prototypes/TestItemMC.form.page 21 Feb 2020 13:45:15 -0000 1.1.2.1
+++ openacs-4/packages/xowf/www/prototypes/TestItemMC.form.page 11 May 2020 14:14:10 -0000 1.1.2.2
@@ -7,6 +7,6 @@
-form {{
} text/html} \
-form_constraints {
{question:test_item,question_type=mc2,grading=ggw wi1 wi2 exact,feedback_level=single,label=#xowf.mc_question#}
- _description:omit _page_order:omit
+ _name:test_item_name _description:omit _page_order:omit
}
Index: openacs-4/packages/xowf/www/prototypes/TestItemReorder.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/Attic/TestItemReorder.form.page,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowf/www/prototypes/TestItemReorder.form.page 8 Mar 2020 17:21:50 -0000 1.1.2.1
+++ openacs-4/packages/xowf/www/prototypes/TestItemReorder.form.page 11 May 2020 14:14:10 -0000 1.1.2.2
@@ -7,7 +7,7 @@
-form {{} text/html} \
-form_constraints {
question:test_item,question_type=ro,grading=none,feedback_level=single,auto_correct=1,label=#xowf.reorder_question#
- _description:omit _page_order:omit
+ _name:test_item_name _description:omit _page_order:omit
}
Index: openacs-4/packages/xowf/www/prototypes/TestItemSC.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/Attic/TestItemSC.form.page,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowf/www/prototypes/TestItemSC.form.page 21 Feb 2020 13:45:15 -0000 1.1.2.1
+++ openacs-4/packages/xowf/www/prototypes/TestItemSC.form.page 11 May 2020 14:14:10 -0000 1.1.2.2
@@ -7,7 +7,7 @@
-form {{} text/html} \
-form_constraints {
question:test_item,question_type=sc,grading=exact,feedback_level=single,label=#xowf.sc_question#
- _description:omit _page_order:omit
+ _name:test_item_name _description:omit _page_order:omit
}
Index: openacs-4/packages/xowf/www/prototypes/TestItemShortText.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/Attic/TestItemShortText.form.page,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowf/www/prototypes/TestItemShortText.form.page 21 Feb 2020 13:45:15 -0000 1.1.2.1
+++ openacs-4/packages/xowf/www/prototypes/TestItemShortText.form.page 11 May 2020 14:14:10 -0000 1.1.2.2
@@ -7,7 +7,7 @@
-form {{} text/html} \
-form_constraints {
question:test_item,question_type=st,grading=none,feedback_level=single,auto_correct=1,label=#xowf.short_text_question#
- _description:omit _page_order:omit
+ _name:test_item_name _description:omit _page_order:omit
}
Index: openacs-4/packages/xowf/www/prototypes/TestItemText.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/Attic/TestItemText.form.page,v
diff -u -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowf/www/prototypes/TestItemText.form.page 26 Feb 2020 21:13:18 -0000 1.1.2.2
+++ openacs-4/packages/xowf/www/prototypes/TestItemText.form.page 11 May 2020 14:14:10 -0000 1.1.2.3
@@ -6,10 +6,9 @@
-text "" \
-form {{} text/html} \
-form_constraints {
-question:test_item,question_type=ot,grading=none,feedback_level=single,auto_correct=1,label=#xowf.text_question#
-_description:omit
-_page_order:omit
-}
+ question:test_item,question_type=ot,grading=none,feedback_level=single,auto_correct=1,label=#xowf.text_question#
+ _name:test_item_name _description:omit _page_order:omit
+ }
Index: openacs-4/packages/xowf/www/prototypes/TestItemUpload.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/Attic/TestItemUpload.form.page,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowf/www/prototypes/TestItemUpload.form.page 21 Feb 2020 13:45:15 -0000 1.1.2.1
+++ openacs-4/packages/xowf/www/prototypes/TestItemUpload.form.page 11 May 2020 14:14:10 -0000 1.1.2.2
@@ -7,7 +7,7 @@
-form {{} text/html} \
-form_constraints {
{question:test_item,question_type=ul,feedback_level=single,label=#xowf.ul_question#}
- _description:omit _page_order:omit
+ _name:test_item_name _description:omit _page_order:omit
}