Bug 11311 - Browse selected authorities
Summary: Browse selected authorities
Status: BLOCKED
Alias: None
Product: Koha
Classification: Unclassified
Component: OPAC (show other bugs)
Version: Main
Hardware: All All
: P5 - low enhancement (vote)
Assignee: Julian Maurice
QA Contact: Testopia
URL:
Keywords:
Depends on: 10858 11296
Blocks:
  Show dependency treegraph
 
Reported: 2013-11-27 13:31 UTC by Jonathan Druart
Modified: 2016-04-11 11:22 UTC (History)
7 users (show)

See Also:
Change sponsored?: ---
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:


Attachments
Bug 11311: Browse selected authorities (17.33 KB, patch)
2013-11-27 13:38 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 11311: Browse selected authorities (16.31 KB, patch)
2015-09-11 12:57 UTC, Julian Maurice
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Druart 2013-11-27 13:31:08 UTC

    
Comment 1 Jonathan Druart 2013-11-27 13:38:45 UTC Comment hidden (obsolete)
Comment 2 Jonathan Druart 2013-11-27 13:40:50 UTC
A patch for the bootstrap theme will be provided when bugs 10858 and 11296 will be pushed.
Comment 3 Sonia Lemaire 2014-03-11 13:51:39 UTC
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 .
Comment 4 Jonathan Druart 2014-03-11 14:58:40 UTC
(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.
Comment 5 Martin Renvoize 2015-01-26 19:01:46 UTC
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.
Comment 6 François Pichenot 2015-03-05 09:11:46 UTC
Install
Comment 7 François Pichenot 2015-03-05 09:13:19 UTC
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
Comment 8 Julian Maurice 2015-09-11 12:57:12 UTC
Created attachment 42481 [details] [review]
Bug 11311: Browse selected authorities

Rebased on master
Comment 9 Frédéric Demians 2015-11-16 16:43:23 UTC
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
Comment 10 Julian Maurice 2015-11-17 08:28:42 UTC
Patch still applies well on master, but you need to apply patches from bug 10858 first.