Item14499: make proper use of $request->param()

as well as some other small js gotchas
foswiki · Sep 25, 2017 · 6fae466 · 6fae466
1 parent ab234bf
commit 6fae466
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.gz
 *.swp
+*.jslint
 pub/System/MultiSaveContrib/jquery.multisave.js
 pub/System/MultiSaveContrib/jquery.multisave.css
 MultiSaveContrib.md5
@@ -9,3 +10,4 @@ MultiSaveContrib.txt
 MultiSaveContrib.zip
 MultiSaveContrib_installer
 MultiSaveContrib_installer.pl
+locale/**/*.mo
diff --git a/data/System/MultiSaveContrib.txt b/data/System/MultiSaveContrib.txt
@@ -1,6 +1,6 @@
 %META:TOPICINFO{author="ProjectContributor" comment="" date="1414597023" format="1.1"  version="1"}%
 ---+!! %TOPIC%
-%SHORTDESCRIPTION%
+%FORMFIELD{"Description"}%
 
 %TOC%
 
@@ -76,23 +76,25 @@ All form elements that changed their values will be flagged so using css automat
 ---++ Adding beforeSaveHander and afterSaveHandler
 
 ---++ Installation Instructions
-
 %$INSTALL_INSTRUCTIONS%
 
----++ Info
-<!--
-   * Set SHORTDESCRIPTION = %$SHORTDESCRIPTION%
--->
-
-|  Author(s): | Michael Daum|
-|  Copyright: | &copy; 2013-2014 Michael Daum http://michaeldaumconsulting.com |
-|  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
-|  Release: | %$RELEASE% |
-|  Version: | %$VERSION% |
-|  Change History: | <!-- versions below in reverse order -->&nbsp; |
+---++ Dependencies
+%$DEPENDENCIES%
+
+---++ Change History
+%TABLE{columnwidths="7em" tablewidth="100%"}%
+|  25 Sep 2017: | fixed use of =param()= api |
 |  20 Sep 2014: | fixed saving of deselected checkboxes and radioboxes |
 |  04 Sep 2013: | fixed manifest |
 |  30 May 2013: | initial release |
-|  Dependencies: | %$DEPENDENCIES% |
-|  Home page: | Foswiki:Extensions/%TOPIC% |
-|  Support: | Foswiki:Support/%TOPIC% |
+
+%META:FORM{name="PackageForm"}%
+%META:FIELD{name="Author" title="Author" value="Michael Daum"}%
+%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2013-2017 Michael Daum http://michaeldaumconsulting.com"}%
+%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
+%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions/%TOPIC%"}%
+%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
+%META:FIELD{name="Release" title="Release" value="%$RELEASE%"}%
+%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/%TOPIC%"}%
+%META:FIELD{name="Support" title="Support" value="Foswiki:Support/%TOPIC%"}%
+%META:FIELD{name="Version" title="Version" value="%$VERSION%"}%
diff --git a/lib/Foswiki/Contrib/MultiSaveContrib.pm b/lib/Foswiki/Contrib/MultiSaveContrib.pm
@@ -1,6 +1,6 @@
 # Extension for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2013-2017 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -21,8 +21,8 @@ use warnings;
 use Foswiki::Plugins();
 use Foswiki::Contrib::JsonRpcContrib ();
 
-our $VERSION = '1.10';
-our $RELEASE = '1.10';
+our $VERSION = '1.20';
+our $RELEASE = '25 Sep 2017';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION = 'Json-RPC interface to save multiple changes in one transaction';
 our $core;

diff --git a/lib/Foswiki/Contrib/MultiSaveContrib/Core.pm b/lib/Foswiki/Contrib/MultiSaveContrib/Core.pm
@@ -1,6 +1,6 @@
 # Extension for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2013-2017 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -98,18 +98,19 @@ sub jsonRpcMultiSave {
 
   writeDebug("called jsonRpcMultiSave()");
   my $wikiName = Foswiki::Func::getWikiName();
-  my $params = $request->params();
+  my @params = $request->multi_param();
   my $formName = $request->param("formName");
 
   writeDebug("saving a $formName") if defined $formName;
 
   # collect required changes
   my %changes = ();
-  foreach my $key (keys %$params) {
-    next unless $key =~ /^multisave{(.*)}{(.*)}$/;
+  foreach my $key (@params) {
+    next if $key eq 'POSTDATA';
+    next unless $key =~ /^multisave\{(.*)\}\{(.*)\}$/;
     my $webTopic = $1;
     my $fieldName = $2;
-    my $fieldValue = $params->{$key};
+    my $fieldValue = $request->param($key);
     $fieldValue = join(", ", grep {!/^$/} @$fieldValue) if ref($fieldValue);
 
     writeDebug("found changes for $webTopic, $fieldName=$fieldValue");

diff --git a/lib/Foswiki/Contrib/MultiSaveContrib/JQuery.pm b/lib/Foswiki/Contrib/MultiSaveContrib/JQuery.pm
@@ -12,7 +12,7 @@ sub new {
     my $this = bless(
         $class->SUPER::new(
             name       => 'MultiSave',
-            version    => '0.03',
+            version    => '0.05',
             author     => 'Michael Daum',
             homepage   => 'http://michaeldaumconsulting.com',
             puburl => '%PUBURLPATH%/%SYSTEMWEB%/MultiSaveContrib',
@@ -31,7 +31,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+Copyright (C) 2013-2017 Michael Daum http://michaeldaumconsulting.com
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Contrib/MultiSaveContrib/MANIFEST b/lib/Foswiki/Contrib/MultiSaveContrib/MANIFEST
@@ -1,3 +1,4 @@
+!noci
 data/System/MultiSaveContrib.txt 0644
 lib/Foswiki/Contrib/MultiSaveContrib/Config.spec 0644
 lib/Foswiki/Contrib/MultiSaveContrib/Core.pm 0644

diff --git a/lib/Foswiki/Contrib/MultiSaveContrib/build.pl b/lib/Foswiki/Contrib/MultiSaveContrib/build.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 BEGIN {
   foreach my $pc (split(/:/, $ENV{FOSWIKI_LIBS})) {
     unshift @INC, $pc;

diff --git a/pub/System/MultiSaveContrib/jquery.multisave.uncompressed.js b/pub/System/MultiSaveContrib/jquery.multisave.uncompressed.js
@@ -1,15 +1,15 @@
 /*
- * jQuery MultiSave plugin 0.04
+ * jQuery MultiSave plugin 0.05
  *
- * Copyright (c) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+ * Copyright (c) 2013-2017 Michael Daum http://michaeldaumconsulting.com
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  *
  */
-jQuery(function($) {
 "use strict";
+jQuery(function($) {
 
   $(".jqMultiSave:not(.jqMultiSaveInited)").livequery(function() {
     var $form = $(this), 
@@ -29,20 +29,20 @@ jQuery(function($) {
         $.blockUI({message:'<h1>Saving ...</h1>'}); 
       },
 
-      error: function(xhr, status, error) { 
+      error: function(xhr, status) { 
         var json = $.parseJSON(xhr.responseText); 
         $.unblockUI(); 
         $results.show().html("<div class='foswikiErrorMessage'>Error: "+status+" "+json.error.message+"</div>"); 
       },
 
-      success: function(data, status, xhr) { 
+      success: function(data) { 
         var changes = 0; 
 
         $.unblockUI(); 
         $results.empty(); 
 
         if (typeof(data.result.success) !== 'undefined') { 
-          $.each(data.result.success, function(key) { 
+          $.each(data.result.success, function() { 
             changes++;
           }); 
         }