[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Nick Clemens  changed:

   What|Removed |Added

 Status|Patch doesn't apply |ASSIGNED
   Assignee|n...@bywatersolutions.com   |koha-b...@lists.koha-commun
   ||ity.org

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Nick Clemens  changed:

   What|Removed |Added

 CC||n...@bywatersolutions.com
 Status|ASSIGNED|NEW

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Joy Nelson  changed:

   What|Removed |Added

   Assignee|k...@bywatersolutions.com   |n...@bywatersolutions.com
 CC||j...@bywatersolutions.com

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Katrin Fischer  changed:

   What|Removed |Added

 Status|Signed Off  |Patch doesn't apply

--- Comment #13 from Katrin Fischer  ---
I am sorry, but this no longer applies:

91933 - Bug 14578: Allow manual merging of import records on match

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14578: Allow manual merging of import records on match
Using index info to reconstruct a base tree...
M   koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
M   koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
M   koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 14578: Allow manual merging of import records on match
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
Patch left in
/tmp/Bug-14578-Allow-manual-merging-of-import-records-o-4t26wv.patch

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Nick Clemens  changed:

   What|Removed |Added

  Attachment #60164|0   |1
is obsolete||

--- Comment #12 from Nick Clemens  ---
Created attachment 91933
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=91933=edit
Bug 14578: Allow manual merging of import records on match

Test plan:
 1) Ensure that normal record merging still correctly functions.
 2) Import a record that matches an existing record (exporting an
existing record and reimporting it is an easy way to test this).
 3) On the manage import batch page, there should now be a link to
Merge.
 4) Clicking this and going through the merge process should leave both
records in place but update the import record.

Sponsored-by: Rutgers School of Law

Signed-off-by: Kyle M Hall 
Signed-off-by: Heather Mitchell 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Nick Clemens  changed:

   What|Removed |Added

 Status|Patch doesn't apply |Signed Off

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Jonathan Druart  changed:

   What|Removed |Added

 CC||jonathan.dru...@bugs.koha-c
   ||ommunity.org
 Status|Signed Off  |Patch doesn't apply

--- Comment #11 from Jonathan Druart  
---
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

--- Comment #10 from Marcel de Rooy  ---
Sure about this change, Kyle ?

--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
@@ -9,7 +9,7 @@ function mergeAuth(authid, summary) {
 if (typeof alreadySelected.mergereference !== 'undefined') {
 refstring = "=" + alreadySelected.mergereference;
 }
-window.location.href = "/cgi-bin/koha/authorities/merge.pl?authid=" +
authid + "=" + alreadySelected.authid + refstring;
+window.location.href =
"/cgi-bin/koha/authorities/merge.pl?record=catalog/" + authid +
"=catalog/" + alreadySelected.authid + refstring;

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Kyle M Hall  changed:

   What|Removed |Added

 Status|Patch doesn't apply |Signed Off

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Kyle M Hall  changed:

   What|Removed |Added

  Attachment #53596|0   |1
is obsolete||

--- Comment #9 from Kyle M Hall  ---
Created attachment 60164
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60164=edit
Bug 14578: Allow manual merging of import records on match

Test plan:
 1) Ensure that normal record merging still correctly functions.
 2) Import a record that matches an existing record (exporting an
existing record and reimporting it is an easy way to test this).
 3) On the manage import batch page, there should now be a link to
Merge.
 4) Clicking this and going through the merge process should leave both
records in place but update the import record.

Sponsored-by: Rutgers School of Law

Signed-off-by: Kyle M Hall 
Signed-off-by: Heather Mitchell 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Mika  changed:

   What|Removed |Added

 Status|Needs Signoff   |Patch doesn't apply
 CC||mikasm...@catalyst.net.nz

--- Comment #8 from Mika  ---
CONFLICT (content): Merge conflict in cataloguing/merge.pl

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Nicole C. Engard  changed:

   What|Removed |Added

 CC|neng...@gmail.com   |

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Nicole C. Engard  changed:

   What|Removed |Added

   Assignee|jwea...@bywatersolutions.co |k...@bywatersolutions.com
   |m   |

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Jesse Weaver  changed:

   What|Removed |Added

  Attachment #53502|0   |1
is obsolete||

--- Comment #7 from Jesse Weaver  ---
Created attachment 53596
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=53596=edit
Bug 14578: Allow manual merging of import records on match

Test plan:
 1) Ensure that normal record merging still correctly functions.
 2) Import a record that matches an existing record (exporting an
existing record and reimporting it is an easy way to test this).
 3) On the manage import batch page, there should now be a link to
Merge.
 4) Clicking this and going through the merge process should leave both
records in place but update the import record.

Sponsored-by: Rutgers School of Law


Forgot sponsored-by.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

--- Comment #6 from Jesse Weaver  ---
Created attachment 53502
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=53502=edit
Bug 14578: Allow manual merging of import records on match

Test plan:
 1) Ensure that normal record merging still correctly functions.
 2) Import a record that matches an existing record (exporting an
existing record and reimporting it is an easy way to test this).
 3) On the manage import batch page, there should now be a link to
Merge.
 4) Clicking this and going through the merge process should leave both
records in place but update the import record.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Jesse Weaver  changed:

   What|Removed |Added

 Status|ASSIGNED|Needs Signoff
   Patch complexity|--- |Medium patch

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Nicole C. Engard  changed:

   What|Removed |Added

 CC||a...@bywatersolutions.com

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Katrin Fischer  changed:

   What|Removed |Added

 CC||katrin.fisc...@bsz-bw.de

--- Comment #1 from Katrin Fischer  ---
Hi Jesse, I'd be very interested in more information about this! Do you have a
spec or can you describe the idea in a few sentences?

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

--- Comment #2 from Nicole C. Engard  ---
Work to be done:
1) For all staged records with found matches, add a 'merge editor' link. This
link will open a page similar to cataloguing/merge.pl
2) Within the merge editor you will be able to select fields to retain/remove
from each record
3) Saving the merge will update the staged record with the selected value
4) At this point, importing the record will replace the existing record with
the staged record that you modified with the merge values

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

--- Comment #3 from Katrin Fischer  ---
Ah, thx Nicole that makes sense - just not quite what I was hoping for :)

We'd like to have something that happens automatically if certain conditions
are met.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

--- Comment #4 from Nicole C. Engard  ---
That would be AWESOME!!! I think this is a step in that direction though :)

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

--- Comment #5 from Katrin Fischer  ---
Yep of course - I think that will be helpful for everyone running the imports
manually.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Nicole C. Engard  changed:

   What|Removed |Added

 CC||neng...@gmail.com
 Status|NEW |ASSIGNED

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Nicole Engard (ByWater) nic...@bywatersolutions.com changed:

   What|Removed |Added

 CC||nic...@bywatersolutions.com

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 14578] Allow merging of records upon import match

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578

Jesse Weaver jwea...@bywatersolutions.com changed:

   What|Removed |Added

Summary|Allow user to merge records |Allow merging of records
   |upon import match   |upon import match

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/