Created attachment 23185 [details] [review] Bug 11311: Browse selected authorities In the same way as the feature "Browse selected biblios", this one adds the same browse feature for authorities. After launching an authority search, some people would like to browse some results from several pages. This patch adds, at the OPAC, a link "Browse selected authorities >>" when at least one authority is checked. You can choose authorities from several page, not only the current one. In this way, checkboxes already checked become again checked when you come back on this results page. After clicking the link, the "Browse results" block is filled with selected authotiries. Test plan: - Launch an authority search at the OPAC - Check some authorities - Go on another page - Check some authorities - Come back to the first page and check that already checked authorities is automatically checked. - Click on the "Browse selected authorities >>" link - Check that you are able to browse results you had checked.
A patch for the bootstrap theme will be provided when bugs 10858 and 11296 will be pushed.
Some problems occurred applying patches from bug 11311: <h1>Something went wrong !</h1>Applying: Bug 11311: Browse selected authorities fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/prog/en/js/commons.js). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 11311: Browse selected authorities When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 11311 - Browse selected authorities 23185 - Bug 11311: Browse selected authorities Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-11311-Browse-selected-authorities-n3If5J.patch .
(In reply to Sonia Lemaire from comment #3) > Some problems occurred applying patches from bug 11311: This patch depends on bug 10858. You cannot test it on a sandbox now.
Happy to rebase this with regard to Auth.pm tidy in bug 13499, but will await news on it's dependency bug 10858 before attempting to do so.
Install
Installation failed on sandbox : The sandbox you've requested is not ready. Some problems occurred applying patches from bug 10858 11311: <h1>Something went wrong !</h1>Applying: Bug 10858: Browse selected biblios Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl CONFLICT (content): Merge conflict in opac/opac-detail.pl CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc left in tree. Failed to merge in the changes. Patch failed at 0001 Bug 10858: Browse selected biblios When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 10858 - Browse selected biblios 25643 - Bug 10858: Browse selected biblios 25644 - Bug 10858 [Follow-up] Browse selected biblios 25645 - Bug 10858: FIX error if no biblio is selected 25646 - Bug 10858: Don't use the cookie if the ft is disabled 25647 - Bug 10858: Browse selected biblios - bootstrap 25648 - Bug 10858: FIX the Browse selected link 25649 - Bug 10858: FIX Only one occurrence of the biblionumbers should be stored 25650 - Bug 10858: Replace Browse results with Browse selected results 25651 - Bug 10858: fix bad merge conflict 25652 - Bug 10858: follow-up Don't use the cookie if the ft is disabled 25653 - Bug 10858: Handle JS deactivated and cookies disabled Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-10858-Browse-selected-biblios-_uhkSZ.patch . sandbox is not ready ! Admin User Koha Jeudi 05 Mars 2015 10:04 A : fpichenot@ville-roubaix.fr Afficher les détails The sandbox you've requested is not ready. Some problems occurred applying patches from bug 10858 11311: <h1>Something went wrong !</h1>Applying: Bug 10858: Browse selected biblios Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl CONFLICT (content): Merge conflict in opac/opac-detail.pl CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc left in tree. Failed to merge in the changes. Patch failed at 0001 Bug 10858: Browse selected biblios When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 10858 - Browse selected biblios 25643 - Bug 10858: Browse selected biblios 25644 - Bug 10858 [Follow-up] Browse selected biblios 25645 - Bug 10858: FIX error if no biblio is selected 25646 - Bug 10858: Don't use the cookie if the ft is disabled 25647 - Bug 10858: Browse selected biblios - bootstrap 25648 - Bug 10858: FIX the Browse selected link 25649 - Bug 10858: FIX Only one occurrence of the biblionumbers should be stored 25650 - Bug 10858: Replace Browse results with Browse selected results 25651 - Bug 10858: fix bad merge conflict 25652 - Bug 10858: follow-up Don't use the cookie if the ft is disabled 25653 - Bug 10858: Handle JS deactivated and cookies disabled
Created attachment 42481 [details] [review] Bug 11311: Browse selected authorities Rebased on master
Can't apply this patch to master: fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/bootstrap/js/commons.js). error: could not build fake ancestor
Patch still applies well on master, but you need to apply patches from bug 10858 first.