diff --git a/C4/Items.pm b/C4/Items.pm index c0375939d6..f1ac3616a0 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -1608,7 +1608,7 @@ sub PrepareItemrecordDisplay { my $class = $plugin->noclick ? ' disabled' : ''; my $title = $plugin->noclick ? 'No popup' : 'Tag editor'; $subfield_data{marc_value} = - qq[...\n] + qq[...\n] . $plugin->javascript; } else { warn $plugin->errstr; diff --git a/Koha/FrameworkPlugin.pm b/Koha/FrameworkPlugin.pm index 842e660233..57555355d0 100644 --- a/Koha/FrameworkPlugin.pm +++ b/Koha/FrameworkPlugin.pm @@ -316,101 +316,24 @@ sub _process_javascript { $script =~ s/\ -HERE +JS } =head1 AUTHOR diff --git a/Koha/UI/Form/Builder/Item.pm b/Koha/UI/Form/Builder/Item.pm index 9ec651e186..7a2f54466f 100644 --- a/Koha/UI/Form/Builder/Item.pm +++ b/Koha/UI/Form/Builder/Item.pm @@ -329,6 +329,7 @@ sub generate_subfield_form { class => $class, nopopup => $plugin->noclick, javascript => $plugin->javascript, + plugin => $plugin->name, }; } else { warn $plugin->errstr; diff --git a/authorities/authorities.pl b/authorities/authorities.pl index 74c22d54f6..3385a260fa 100755 --- a/authorities/authorities.pl +++ b/authorities/authorities.pl @@ -200,6 +200,7 @@ sub create_input { maxlength => $max_length, javascript => $plugin->javascript, noclick => $plugin->noclick, + plugin => $plugin->name, }; } else { # warn and supply default field warn $plugin->errstr; diff --git a/cataloguing/value_builder/EXAMPLE.pl b/cataloguing/value_builder/EXAMPLE.pl index 713bfa41df..6a952845b5 100755 --- a/cataloguing/value_builder/EXAMPLE.pl +++ b/cataloguing/value_builder/EXAMPLE.pl @@ -65,37 +65,19 @@ my $builder = sub { |; }; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc index aa92f7bb61..86bfcc4266 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -173,11 +173,19 @@ readonly="readonly" /> [% ELSE %] - + [% IF ( mv.nopopup ) %] - ... + ... [% ELSE %] - ... + ... [% END %] [% UNLESS no_plugin %] [%# FIXME - from batchMod-edit, jQuery is included at the end of the template and cataloguing plugins are not working in this situation %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index f08f0d77ed..20639644a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -539,7 +539,7 @@
No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used
[% END %] - +