Three subroutines from the C4::Koha module deal with biblio frameworks and could be replaced or moved to Koha::BiblioFramework: - getframeworks - getframeworkinfo - GetFrameworksLoop
Created attachment 47923 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::GetFrameworksLoop The C4::Koha::GetFrameworksLoop retrieves biblio frameworks and returns them ordered by the description (frameworktext). If a parameter is passed, a selected flag is set. The selection of the options should be done on the template side. These 2 calls can be replaced with Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); Test plan: 1/ Go on a Labeled MARC biblio view (catalogue/labeledMARCdetail.pl) You should see a dropdown list with the biblio frameworks. The framework of the record should be selected by default 2/ Create a sql report using the biblio_framework parameter, something like: SELECT COUNT(*) FROM biblio WHERE frameworkcode=<<framework|biblio_framework>> Save and execute the report. You should get a dropdown list with the framework list.
Created attachment 47924 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks C4::Koha::getframeworks returned a hashref of biblio frameworks. It was mainly used to generate the dropdown list of frameworks. The scripts modified in this patch did not necessary order the element by description (frameworktext), the displays were not consistent from one screen to another. Using the same search method everywhere: Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); We will know always get the framework in the same order. Test plan: Following the different pages modified by this patch, and make sure the frameworks are displayed correctly in the dropdown list: 1/ acqui/z3950_search.pl - Create an order from an external source. 2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field 3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select another framework than the default one and click on the 'Search' button 4/ catalogue/MARCdetail.pl - On the MARC defail page, change the framework you want to use to display the record 5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its framework. When editing, the framework of the record should be selected by default 6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click on the "New record" button. You should see all the frameworks 7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first step (select the merge reference), you should be allowed to select the framework to use. 8/ tools/inventory.pl - On the inventory page, the "Item statuses" part should be populated as before this patch 9/ tools/manage-marc-import.pl - Stage records for import. Before importing them into the catalog, you should see the framework dropdown list.
Created attachment 47925 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should get a warning message if you don't have the FA (Fast cataloguing) framework Note that the admin/marctagstructure.pl has already been tested in the previous patch.
To test this patch, makes sure you have the last patch from bug 14889 applied: Bug 14889: Fix typo in Koha/BiblioFrameworks.pm
Created attachment 48938 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::GetFrameworksLoop The C4::Koha::GetFrameworksLoop retrieves biblio frameworks and returns them ordered by the description (frameworktext). If a parameter is passed, a selected flag is set. The selection of the options should be done on the template side. These 2 calls can be replaced with Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); Test plan: 1/ Go on a Labeled MARC biblio view (catalogue/labeledMARCdetail.pl) You should see a dropdown list with the biblio frameworks. The framework of the record should be selected by default 2/ Create a sql report using the biblio_framework parameter, something like: SELECT COUNT(*) FROM biblio WHERE frameworkcode=<<framework|biblio_framework>> Save and execute the report. You should get a dropdown list with the framework list.
Created attachment 48939 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks C4::Koha::getframeworks returned a hashref of biblio frameworks. It was mainly used to generate the dropdown list of frameworks. The scripts modified in this patch did not necessary order the element by description (frameworktext), the displays were not consistent from one screen to another. Using the same search method everywhere: Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); We will know always get the framework in the same order. Test plan: Following the different pages modified by this patch, and make sure the frameworks are displayed correctly in the dropdown list: 1/ acqui/z3950_search.pl - Create an order from an external source. 2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field 3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select another framework than the default one and click on the 'Search' button 4/ catalogue/MARCdetail.pl - On the MARC defail page, change the framework you want to use to display the record 5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its framework. When editing, the framework of the record should be selected by default 6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click on the "New record" button. You should see all the frameworks 7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first step (select the merge reference), you should be allowed to select the framework to use. 8/ tools/inventory.pl - On the inventory page, the "Item statuses" part should be populated as before this patch 9/ tools/manage-marc-import.pl - Stage records for import. Before importing them into the catalog, you should see the framework dropdown list.
Created attachment 48940 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should get a warning message if you don't have the FA (Fast cataloguing) framework Note that the admin/marctagstructure.pl has already been tested in the previous patch.
Patches rebased.
Can't apply. >fatal: sha1 information is lacking or useless (C4/Koha.pm). >Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge zurückzufallen. >Kann nicht zu 3-Wege-Merge zurückfallen. >Anwendung des Patches fehlgeschlagen bei 0001 Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo
Created attachment 50259 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should get a warning message if you don't have the FA (Fast cataloguing) framework Note that the admin/marctagstructure.pl has already been tested in the previous patch.
Sorry, does not apply again. I promise to test and sign. Applying: Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks fatal: sha1 information is lacking or useless (C4/Koha.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Created attachment 51385 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::GetFrameworksLoop The C4::Koha::GetFrameworksLoop retrieves biblio frameworks and returns them ordered by the description (frameworktext). If a parameter is passed, a selected flag is set. The selection of the options should be done on the template side. These 2 calls can be replaced with Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); Test plan: 1/ Go on a Labeled MARC biblio view (catalogue/labeledMARCdetail.pl) You should see a dropdown list with the biblio frameworks. The framework of the record should be selected by default 2/ Create a sql report using the biblio_framework parameter, something like: SELECT COUNT(*) FROM biblio WHERE frameworkcode=<<framework|biblio_framework>> Save and execute the report. You should get a dropdown list with the framework list.
Created attachment 51386 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks C4::Koha::getframeworks returned a hashref of biblio frameworks. It was mainly used to generate the dropdown list of frameworks. The scripts modified in this patch did not necessary order the element by description (frameworktext), the displays were not consistent from one screen to another. Using the same search method everywhere: Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); We will know always get the framework in the same order. Test plan: Following the different pages modified by this patch, and make sure the frameworks are displayed correctly in the dropdown list: 1/ acqui/z3950_search.pl - Create an order from an external source. 2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field 3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select another framework than the default one and click on the 'Search' button 4/ catalogue/MARCdetail.pl - On the MARC defail page, change the framework you want to use to display the record 5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its framework. When editing, the framework of the record should be selected by default 6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click on the "New record" button. You should see all the frameworks 7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first step (select the merge reference), you should be allowed to select the framework to use. 8/ tools/inventory.pl - On the inventory page, the "Item statuses" part should be populated as before this patch 9/ tools/manage-marc-import.pl - Stage records for import. Before importing them into the catalog, you should see the framework dropdown list.
Created attachment 51387 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should get a warning message if you don't have the FA (Fast cataloguing) framework Note that the admin/marctagstructure.pl has already been tested in the previous patch.
Hi Jonathan 1) Small qa fail FAIL koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt FAIL forbidden patterns forbidden pattern: tab char (line 66) 2) Bad: Can't change framework on edit, think that this code needs change koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt line 495+ [% FOREACH frameworkcodeloo IN frameworkcodeloop %] 3) Test plan for third patch: don't get a warning, only a link to fast catalog if FA is present and have right permissions. All other parts of all test plans works.
Created attachment 51426 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should see a "Fast cataloguing" link if the FA framework exists. Note that the admin/marctagstructure.pl has already been tested in the previous patch.
Created attachment 51427 [details] [review] Bug 15801: minor fixes - Fix a tab - Fix a variable name in a template
(In reply to Bernardo Gonzalez Kriegel from comment #15) > Hi Jonathan Hi Bernardo, Thanks for testing :) > 1) Small qa fail > FAIL koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt > FAIL forbidden patterns > forbidden pattern: tab char (line 66) Fixed. > 2) Bad: Can't change framework on edit, think that this code needs change > > koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt > > line 495+ [% FOREACH frameworkcodeloo IN frameworkcodeloop %] Fixed as well. > 3) Test plan for third patch: don't get a warning, only a link to fast > catalog if FA is present and have right permissions. I have updated the test plan, actually you should see a "Fast cataloguing" like if the FA framework exists.
Created attachment 51432 [details] [review] [SIGNED-OFF] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::GetFrameworksLoop The C4::Koha::GetFrameworksLoop retrieves biblio frameworks and returns them ordered by the description (frameworktext). If a parameter is passed, a selected flag is set. The selection of the options should be done on the template side. These 2 calls can be replaced with Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); Test plan: 1/ Go on a Labeled MARC biblio view (catalogue/labeledMARCdetail.pl) You should see a dropdown list with the biblio frameworks. The framework of the record should be selected by default 2/ Create a sql report using the biblio_framework parameter, something like: SELECT COUNT(*) FROM biblio WHERE frameworkcode=<<framework|biblio_framework>> Save and execute the report. You should get a dropdown list with the framework list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Both dropdowns Ok No errors
Created attachment 51433 [details] [review] [SIGNED-OFF] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks C4::Koha::getframeworks returned a hashref of biblio frameworks. It was mainly used to generate the dropdown list of frameworks. The scripts modified in this patch did not necessary order the element by description (frameworktext), the displays were not consistent from one screen to another. Using the same search method everywhere: Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); We will know always get the framework in the same order. Test plan: Following the different pages modified by this patch, and make sure the frameworks are displayed correctly in the dropdown list: 1/ acqui/z3950_search.pl - Create an order from an external source. 2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field 3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select another framework than the default one and click on the 'Search' button 4/ catalogue/MARCdetail.pl - On the MARC defail page, change the framework you want to use to display the record 5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its framework. When editing, the framework of the record should be selected by default 6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click on the "New record" button. You should see all the frameworks 7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first step (select the merge reference), you should be allowed to select the framework to use. 8/ tools/inventory.pl - On the inventory page, the "Item statuses" part should be populated as before this patch 9/ tools/manage-marc-import.pl - Stage records for import. Before importing them into the catalog, you should see the framework dropdown list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Works Ok. No errors
Created attachment 51434 [details] [review] [SIGNED-OFF] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should see a "Fast cataloguing" link if the FA framework exists. Note that the admin/marctagstructure.pl has already been tested in the previous patch. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Link pops Ok No errors
Created attachment 51435 [details] [review] [SIGNED-OFF] Bug 15801: minor fixes - Fix a tab - Fix a variable name in a template Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> With all patches applied no errors.
Created attachment 54348 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::GetFrameworksLoop The C4::Koha::GetFrameworksLoop retrieves biblio frameworks and returns them ordered by the description (frameworktext). If a parameter is passed, a selected flag is set. The selection of the options should be done on the template side. These 2 calls can be replaced with Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); Test plan: 1/ Go on a Labeled MARC biblio view (catalogue/labeledMARCdetail.pl) You should see a dropdown list with the biblio frameworks. The framework of the record should be selected by default 2/ Create a sql report using the biblio_framework parameter, something like: SELECT COUNT(*) FROM biblio WHERE frameworkcode=<<framework|biblio_framework>> Save and execute the report. You should get a dropdown list with the framework list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Both dropdowns Ok No errors
Created attachment 54349 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks C4::Koha::getframeworks returned a hashref of biblio frameworks. It was mainly used to generate the dropdown list of frameworks. The scripts modified in this patch did not necessary order the element by description (frameworktext), the displays were not consistent from one screen to another. Using the same search method everywhere: Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); We will know always get the framework in the same order. Test plan: Following the different pages modified by this patch, and make sure the frameworks are displayed correctly in the dropdown list: 1/ acqui/z3950_search.pl - Create an order from an external source. 2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field 3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select another framework than the default one and click on the 'Search' button 4/ catalogue/MARCdetail.pl - On the MARC defail page, change the framework you want to use to display the record 5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its framework. When editing, the framework of the record should be selected by default 6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click on the "New record" button. You should see all the frameworks 7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first step (select the merge reference), you should be allowed to select the framework to use. 8/ tools/inventory.pl - On the inventory page, the "Item statuses" part should be populated as before this patch 9/ tools/manage-marc-import.pl - Stage records for import. Before importing them into the catalog, you should see the framework dropdown list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Works Ok. No errors
Created attachment 54350 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should see a "Fast cataloguing" link if the FA framework exists. Note that the admin/marctagstructure.pl has already been tested in the previous patch. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Link pops Ok No errors
Created attachment 54351 [details] [review] Bug 15801: minor fixes - Fix a tab - Fix a variable name in a template Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> With all patches applied no errors.
A bit too many conflicts for me to fix - can you please take a look, Jonathan?
Created attachment 55688 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::GetFrameworksLoop The C4::Koha::GetFrameworksLoop retrieves biblio frameworks and returns them ordered by the description (frameworktext). If a parameter is passed, a selected flag is set. The selection of the options should be done on the template side. These 2 calls can be replaced with Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); Test plan: 1/ Go on a Labeled MARC biblio view (catalogue/labeledMARCdetail.pl) You should see a dropdown list with the biblio frameworks. The framework of the record should be selected by default 2/ Create a sql report using the biblio_framework parameter, something like: SELECT COUNT(*) FROM biblio WHERE frameworkcode=<<framework|biblio_framework>> Save and execute the report. You should get a dropdown list with the framework list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Both dropdowns Ok No errors
Created attachment 55689 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks C4::Koha::getframeworks returned a hashref of biblio frameworks. It was mainly used to generate the dropdown list of frameworks. The scripts modified in this patch did not necessary order the element by description (frameworktext), the displays were not consistent from one screen to another. Using the same search method everywhere: Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); We will know always get the framework in the same order. Test plan: Following the different pages modified by this patch, and make sure the frameworks are displayed correctly in the dropdown list: 1/ acqui/z3950_search.pl - Create an order from an external source. 2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field 3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select another framework than the default one and click on the 'Search' button 4/ catalogue/MARCdetail.pl - On the MARC defail page, change the framework you want to use to display the record 5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its framework. When editing, the framework of the record should be selected by default 6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click on the "New record" button. You should see all the frameworks 7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first step (select the merge reference), you should be allowed to select the framework to use. 8/ tools/inventory.pl - On the inventory page, the "Item statuses" part should be populated as before this patch 9/ tools/manage-marc-import.pl - Stage records for import. Before importing them into the catalog, you should see the framework dropdown list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Works Ok. No errors
Created attachment 55690 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should see a "Fast cataloguing" link if the FA framework exists. Note that the admin/marctagstructure.pl has already been tested in the previous patch. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Link pops Ok No errors
Created attachment 55691 [details] [review] Bug 15801: minor fixes - Fix a tab - Fix a variable name in a template Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> With all patches applied no errors.
QA: Looking here now
Created attachment 56452 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::GetFrameworksLoop The C4::Koha::GetFrameworksLoop retrieves biblio frameworks and returns them ordered by the description (frameworktext). If a parameter is passed, a selected flag is set. The selection of the options should be done on the template side. These 2 calls can be replaced with Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); Test plan: 1/ Go on a Labeled MARC biblio view (catalogue/labeledMARCdetail.pl) You should see a dropdown list with the biblio frameworks. The framework of the record should be selected by default 2/ Create a sql report using the biblio_framework parameter, something like: SELECT COUNT(*) FROM biblio WHERE frameworkcode=<<framework|biblio_framework>> Save and execute the report. You should get a dropdown list with the framework list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Both dropdowns Ok No errors Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 56453 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks C4::Koha::getframeworks returned a hashref of biblio frameworks. It was mainly used to generate the dropdown list of frameworks. The scripts modified in this patch did not necessary order the element by description (frameworktext), the displays were not consistent from one screen to another. Using the same search method everywhere: Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); We will know always get the framework in the same order. Test plan: Following the different pages modified by this patch, and make sure the frameworks are displayed correctly in the dropdown list: 1/ acqui/z3950_search.pl - Create an order from an external source. 2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field 3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select another framework than the default one and click on the 'Search' button 4/ catalogue/MARCdetail.pl - On the MARC defail page, change the framework you want to use to display the record 5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its framework. When editing, the framework of the record should be selected by default 6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click on the "New record" button. You should see all the frameworks 7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first step (select the merge reference), you should be allowed to select the framework to use. 8/ tools/inventory.pl - On the inventory page, the "Item statuses" part should be populated as before this patch 9/ tools/manage-marc-import.pl - Stage records for import. Before importing them into the catalog, you should see the framework dropdown list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Works Ok. No errors Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 56454 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should see a "Fast cataloguing" link if the FA framework exists. Note that the admin/marctagstructure.pl has already been tested in the previous patch. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Link pops Ok No errors Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 56455 [details] [review] Bug 15801: minor fixes - Fix a tab - Fix a variable name in a template Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> With all patches applied no errors. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 56766 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::GetFrameworksLoop The C4::Koha::GetFrameworksLoop retrieves biblio frameworks and returns them ordered by the description (frameworktext). If a parameter is passed, a selected flag is set. The selection of the options should be done on the template side. These 2 calls can be replaced with Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); Test plan: 1/ Go on a Labeled MARC biblio view (catalogue/labeledMARCdetail.pl) You should see a dropdown list with the biblio frameworks. The framework of the record should be selected by default 2/ Create a sql report using the biblio_framework parameter, something like: SELECT COUNT(*) FROM biblio WHERE frameworkcode=<<framework|biblio_framework>> Save and execute the report. You should get a dropdown list with the framework list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Both dropdowns Ok No errors Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 56767 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks C4::Koha::getframeworks returned a hashref of biblio frameworks. It was mainly used to generate the dropdown list of frameworks. The scripts modified in this patch did not necessary order the element by description (frameworktext), the displays were not consistent from one screen to another. Using the same search method everywhere: Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); We will know always get the framework in the same order. Test plan: Following the different pages modified by this patch, and make sure the frameworks are displayed correctly in the dropdown list: 1/ acqui/z3950_search.pl - Create an order from an external source. 2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field 3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select another framework than the default one and click on the 'Search' button 4/ catalogue/MARCdetail.pl - On the MARC defail page, change the framework you want to use to display the record 5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its framework. When editing, the framework of the record should be selected by default 6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click on the "New record" button. You should see all the frameworks 7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first step (select the merge reference), you should be allowed to select the framework to use. 8/ tools/inventory.pl - On the inventory page, the "Item statuses" part should be populated as before this patch 9/ tools/manage-marc-import.pl - Stage records for import. Before importing them into the catalog, you should see the framework dropdown list. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Works Ok. No errors Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 56768 [details] [review] Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo This was the "Get" subroutine for the framework, it can be easily replaced with a call to the Koha::BiblioFrameworks->find method. This patch also replaces some confusing wordings (framework vs frameworkcode). Test plan: On the circulation home page, you should see a "Fast cataloguing" link if the FA framework exists. Note that the admin/marctagstructure.pl has already been tested in the previous patch. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Link pops Ok No errors Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 56769 [details] [review] Bug 15801: minor fixes - Fix a tab - Fix a variable name in a template Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> With all patches applied no errors. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Pushed to master for 16.11, thanks Jonathan!