Merge branch 'bug_6554' into 3.12-master

[koha_fer] / cataloguing / value_builder / marc21_field_007.pl

diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl
index 9969f29..c852fa0 100755 (executable)
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ b/cataloguing/value_builder/marc21_field_007.pl
@@ -14,11 +14,12 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Auth;
 use CGI;
 use C4::Context;
@@ -26,7 +27,7 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
@@ -54,7 +55,7 @@ function Blur$function_name(subfield_managed) {
 
 function Clic$function_name(i) {
        defaultvalue=document.getElementById(\"$field_number\").value;
-       newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=marc21_field_007.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+       newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=marc21_field_007.pl&index=$field_number&result=\"+defaultvalue,\"tag_editor\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 //]]>
@@ -76,7 +77,7 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {editcatalogue => 1},
+                            flagsrequired => {editcatalogue => '*'},
                             debug => 1,
                             });
        $result = "ta" unless $result;
@@ -107,7 +108,7 @@ my ($template, $loggedinuser, $cookie)
 #FIXME:  There is probably a more-elegant way to do this!
 #FIXME:  Two of the material types treat position 06, 07, and 08 as a single
 #three-char field.  This script works fine for creating values and sending them
-#back to the MARC, but if there is already a value in the 007, it won't send 
+#back to the MARC, but if there is already a value in the 007, it won't send
 #it properly to the value builder for those two instances.  Not sure how to solve.
        $template->param( index => $index,
                         f0 => $f0,