Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 18111: Swap framework_name and frameworkcode

Browse source 
With the frameworkcode changed to an empty string, which really
is closer to the physical reality, some javascript somewhere
breaks. This means the spinner does not appear when you confirm
that you wish to import it.

TEST PLAN
----------
1) apply first patch
2) export default framework, doesn't matter format
3) import default framework using that file.
4) answer yes or whatever it is.
   -- spinner does not appear.
5) apply this patch
6) import default framework use the same file.
7) answer yes or whatever it is.
   -- spinner does appear.
8) decide if you wish to find and fix the javascript conditions.
   if yes -- do so, and then obsolete this once you have.
   if not -- sign this off after running koha qa test tools

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Mark Tompsett 2017-02-18 23:06:16 -05:00 committed by Kyle M Hall
parent c12aa9664c
commit 1ce61ac6a3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/import_export_framework.pl
View file

@ -46,8 +46,8 @@ unless ($authenticated) {
exit 0; exit 0;
} }
my $frameworkcode = $input->param('frameworkcode') || ''; my $framework_name = $input->param('frameworkcode') || 'default';
my $framework_name = $frameworkcode || 'default'; my $frameworkcode = ($framework_name eq 'default') ? q{} : $framework_name;
my $action = $input->param('action') || 'export'; my $action = $input->param('action') || 'export';
## Exporting ## Exporting

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
View file

@ -189,7 +189,7 @@
</div> </div>
<form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_default" id="form_i_default" method="post" enctype="multipart/form-data" class="form_import"> <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_default" id="form_i_default" method="post" enctype="multipart/form-data" class="form_import">
<div class="modal-body"> <div class="modal-body">
<input type="hidden" name="frameworkcode" value="" /> <input type="hidden" name="frameworkcode" value="default" />
<input type="hidden" name="action" value="import" /> <input type="hidden" name="action" value="import" />
<p><label for="file_import_default">Upload file:</label> <input type="file" name="file_import_default" id="file_import_default" class="input_import" /></p> <p><label for="file_import_default">Upload file:</label> <input type="file" name="file_import_default" id="file_import_default" class="input_import" /></p>
<div id="importing_default" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div> <div id="importing_default" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div>