Item14303: fixes to topic formfield

* store web dot topic names * be more robust when parsing strange values * jslint fixes
foswiki · Jan 25, 2017 · 8fb199a · 8fb199a
1 parent 6133cf1
commit 8fb199a
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 24 deletions.
diff --git a/data/System/MoreFormfieldsPlugin.txt b/data/System/MoreFormfieldsPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1467204325" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1485349736" format="1.1"  version="1"}%
 ---+!! %TOPIC%
 %FORMFIELD{"Description"}%
 
@@ -205,6 +205,7 @@ A user reference using JQSelect2Contrib for autocompletion.
 
 ---++ Change History
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  25 Jan 2017: | fixed =topic= formfield to properly store web dot topic values |
 |  16 Jan 2017: | replace <nop>MoreFormfieldsAjaxHelper with a template solution to be able to override it when required; \
                   fixes in =id= and =autofill= formfields; \
                   defaulting to YYYY/MM/DD in =date2= formfield now to prevent browsers from interpreting date formfields using their own idea of locales; \

diff --git a/lib/Foswiki/Form/Topic.pm b/lib/Foswiki/Form/Topic.pm
@@ -111,28 +111,26 @@ sub getDisplayValue {
   if ($this->isMultiValued) {
     my @result = ();
     foreach my $val (split(/\s*,\s*/, $value)) {
-      my $origVal = $val;
+      my ($web, $topic) = Foswiki::Func::normalizeWebTopicName($this->{_web}, $val);
       if ($this->isValueMapped) {
         if (defined($this->{valueMap}{$val})) {
           $val = $this->{valueMap}{$val};
         }
       } else {
-        $val = $this->getTopicTitle($this->{_web}, $val);
+        $val = $this->getTopicTitle($web, $topic);
       }
-      my ($web, $topic) = Foswiki::Func::normalizeWebTopicName($this->{_web}, $origVal);
       push @result, "<a href='%SCRIPTURLPATH{view}%/$web/$topic'>$val</a>";
     }
     $value = join(", ", @result);
   } else {
-    my $origVal = $value;
+    my ($web, $topic) = Foswiki::Func::normalizeWebTopicName($this->{_web}, $value);
     if ($this->isValueMapped) {
       if (defined($this->{valueMap}{$value})) {
         $value = $this->{valueMap}{$value};
       }
     } else {
-      $value = $this->getTopicTitle($this->{_web}, $value);
+      $value = $this->getTopicTitle($web, $topic);
     }
-    my ($web, $topic) = Foswiki::Func::normalizeWebTopicName($this->{_web}, $origVal);
     $value = "<a href='%SCRIPTURLPATH{view}%/$web/$topic'>$value</a>";
   }
 

diff --git a/lib/Foswiki/Plugins/MoreFormfieldsPlugin.pm b/lib/Foswiki/Plugins/MoreFormfieldsPlugin.pm
@@ -25,8 +25,8 @@ use Foswiki::Plugins ();
 
 use Error qw(:try);
 
-our $VERSION = '3.00';
-our $RELEASE = '16 Jan 2017';
+our $VERSION = '3.01';
+our $RELEASE = '25 Jan 2017';
 our $SHORTDESCRIPTION = 'Additional formfield types for %SYSTEMWEB%.DataForms';
 our $NO_PREFS_IN_TOPIC = 1;
 

diff --git a/pub/System/MoreFormfieldsPlugin/clockpicker.init.uncompressed.js b/pub/System/MoreFormfieldsPlugin/clockpicker.init.uncompressed.js
@@ -1,3 +1,4 @@
+"use strict";
 jQuery(function($) {
   $(".jqClockPicker").livequery(function() {
     $(this).clockpicker();

diff --git a/pub/System/MoreFormfieldsPlugin/iconfield.uncompressed.js b/pub/System/MoreFormfieldsPlugin/iconfield.uncompressed.js
@@ -1,5 +1,5 @@
-jQuery(function($) {
 "use strict";
+jQuery(function($) {
 
   var defaults = {
     minimumInputLength: 0,

diff --git a/pub/System/MoreFormfieldsPlugin/networkaddress.uncompressed.js b/pub/System/MoreFormfieldsPlugin/networkaddress.uncompressed.js
@@ -1,5 +1,5 @@
-jQuery(function($) {
 "use strict";
+jQuery(function($) {
 
   // methods
   jQuery.validator.addMethod("ipv4_address", function(value, element, param) {

diff --git a/pub/System/MoreFormfieldsPlugin/phonenumber.uncompressed.js b/pub/System/MoreFormfieldsPlugin/phonenumber.uncompressed.js
@@ -1,5 +1,5 @@
-(function($) {
 "use strict";
+(function($) {
 
   $.validator.addMethod('phone', function(value, element) {
     value = value.replace(/\s/g,'');

diff --git a/pub/System/MoreFormfieldsPlugin/select2.uncompressed.js b/pub/System/MoreFormfieldsPlugin/select2.uncompressed.js
@@ -1,5 +1,5 @@
-jQuery(function($) {
 "use strict";
+jQuery(function($) {
 
   var defaults = {
     minimumInputLength: 0,
@@ -51,8 +51,9 @@ jQuery(function($) {
         }
       },
       initSelection: function(elem, callback) {
-	var data = [], text;
+	var data, text;
 	if (opts.multiple) {
+          data = [];
 	  $(val.split(/\s*,\s*/)).each(function () {
 	    text = decodeURIComponent(opts.valueText[this]||this);
 	    data.push({id: this, text: text});

diff --git a/pub/System/MoreFormfieldsPlugin/smartbox.js b/pub/System/MoreFormfieldsPlugin/smartbox.js
diff --git a/pub/System/MoreFormfieldsPlugin/smartbox.uncompressed.js b/pub/System/MoreFormfieldsPlugin/smartbox.uncompressed.js
@@ -1,5 +1,5 @@
-jQuery(function($) {
 "use strict";
+jQuery(function($) {
 
   $(document).on("change", ".foswikiSmartboxItem", function() {
     var $this = $(this), 

diff --git a/pub/System/MoreFormfieldsPlugin/topicfield.uncompressed.js b/pub/System/MoreFormfieldsPlugin/topicfield.uncompressed.js
@@ -1,5 +1,5 @@
-jQuery(function($) {
 "use strict";
+jQuery(function($) {
 
   var defaults = {
     minimumInputLength: 0,
@@ -62,15 +62,26 @@ jQuery(function($) {
         }
       },
       initSelection: function(elem, callback) {
-	var data = [], text;
+	var data, text;
 	if (opts.multiple) {
+          data = [];
 	  $(val.split(/\s*,\s*/)).each(function () {
-	    text = decodeURIComponent(opts.valueText[this]||this);
-	    data.push({id: this, text: text});
+            text = opts.valueText[this]||this;
+            try {
+              text = decodeURIComponent(text);
+              data.push({id: this, text: text});
+            } catch(err) {
+              console && console.error("Error: illegal value in topicfield:",text); 
+            };
 	  });
 	} else {
-          text = decodeURIComponent(opts.valueText);
-	  data = {id:val, text:text};
+          text = opts.valueText;
+          try {
+            text = decodeURIComponent(text);
+            data = {id: this, text: text};
+          } catch(err) {
+            console && console.error("Error: illegal value in topicfield:",text); 
+          };
 	}
 	callback(data);
       },

diff --git a/pub/System/MoreFormfieldsPlugin/userfield.uncompressed.js b/pub/System/MoreFormfieldsPlugin/userfield.uncompressed.js
@@ -1,5 +1,5 @@
-jQuery(function($) {
 "use strict";
+jQuery(function($) {
 
   var defaults = {
     minimumInputLength: 0,
@@ -61,8 +61,9 @@ jQuery(function($) {
         }
       },
       initSelection: function(elem, callback) {
-	var data = [], text;
+	var data, text;
 	if (opts.multiple) {
+          data = [];
 	  $(val.split(/\s*,\s*/)).each(function () {
 	    text = decodeURIComponent(opts.valueText[this]||this);
 	    data.push({id: this, text: text});