http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Frédérick Capovilla <fcapovilla@live.ca> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff Patch complexity|--- |Small patch Change sponsored?|--- |Sponsored -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Maxime Beaulieu <maxime.beaulieu@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Maxime Beaulieu <maxime.beaulieu@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |maxime.beaulieu@inlibro.com Assignee|fcapovilla@live.ca |maxime.beaulieu@inlibro.com -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #3 from Owen Leonard <oleonard@myacpl.org> --- I have tested an import which contains records which match existing records but I don't see a "diff" column in the table of staged records. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 --- Comment #4 from Maxime Beaulieu <maxime.beaulieu@inlibro.com> --- Created attachment 30787 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30787&action=edit Bug 11876 - Diff column is now displayed. If a match is found, a 'View' link appears in the Diff column. Old patch was not implementing datatables, and therefore was not compatible with this version of Koha. modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt modified: tools/batch_records_ajax.pl -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30591|0 |1 is obsolete| | --- Comment #6 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 30798 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30798&action=edit [SIGNED-OFF] Bug 11876 - Ommited files in last patch I forgot to include these files in the last patch new file: catalogue/showdiffmarc.pl new file: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|Small patch |Medium patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Maxime Beaulieu <maxime.beaulieu@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |eric.begin@inLibro.com, | |francois.charbonnier@inlibr | |o.com, | |philippe.blouin@inlibro.com -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Nick Clemens <nick@quecheelibrary.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |nick@quecheelibrary.org --- Comment #9 from Nick Clemens <nick@quecheelibrary.org> --- Bug 11876 - Add a diff view to staged MARC Records. 30797 - [SIGNED-OFF] Bug 11876 - Add a diff view for staged MARC records. 30798 - [SIGNED-OFF] Bug 11876 - Ommited files in last patch 30799 - [SIGNED-OFF] Bug 11876 - Diff column is now displayed. 30800 - Bug 11876 [Follow-up] Add a diff view to staged MARC Records Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11876 - Add a diff view for staged MARC records. Applying: Bug 11876 - Ommited files in last patch Applying: Bug 11876 - Diff column is now displayed. Applying: Bug 11876 [Follow-up] Add a diff view to staged MARC Records Using index info to reconstruct a base tree... <stdin>:289: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Removing koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/about.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/about.tt Removing catalogue/showdiffmarc.pl Failed to merge in the changes. Patch failed at 0001 Bug 11876 [Follow-up] Add a diff view to staged MARC Records 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-11876-Follow-up-Add-a-diff-view-to-staged-MARC-iDw65M.patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30800|0 |1 is obsolete| | --- Comment #10 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 31835 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31835&action=edit Bug 11876 [Follow-up] Add a diff view to staged MARC Records This follow up makes some corrections to the previously added files and adds some functionality to the diff: A Javascript diff plugin highlights the differences between the records in the two columns. Corrections made: Converted tab indentation to spaces, corrected GPL statement. File organization: Moved showdiffmarc.pl and .tt to /tools/ to match the location of the page with which it functions, tools/manage-marc-import.pl. Corrected permissions on showdiffmarc.pl accordingly. Updates to the template: Added standard includes inclucing header menu and breadcrumbs; converted custom layout to YUI Grid standard. To test, follow the test plan previously defined: - Stage a MARC record batch which contains at least one record match for something already in your catalog. - Locate the staged MARC record batch in Tools -> Manage staged records and click to view the contents. - Find the record which matched an existing record and click the "View" link in the Diff column. - The compare screen should include the header menu and breadcrumbs. The differences between your staged file and the existing record should be higlighted. - You should be able to return to the MARC batch you were previously viewing by following the link in the breadcrumbs or the link at the bottom of the page. - Confirm that the "About" page includes information about the new JavaScript plugin on the Licenses tab. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Nick Clemens <nick@quecheelibrary.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #31835|0 |1 is obsolete| | --- Comment #11 from Nick Clemens <nick@quecheelibrary.org> --- Created attachment 31847 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31847&action=edit [SIGNED OFF] Bug 11876 [Follow-up] Add a diff view to staged MARC Records This follow up makes some corrections to the previously added files and adds some functionality to the diff: A Javascript diff plugin highlights the differences between the records in the two columns. Corrections made: Converted tab indentation to spaces, corrected GPL statement. File organization: Moved showdiffmarc.pl and .tt to /tools/ to match the location of the page with which it functions, tools/manage-marc-import.pl. Corrected permissions on showdiffmarc.pl accordingly. Updates to the template: Added standard includes inclucing header menu and breadcrumbs; converted custom layout to YUI Grid standard. To test, follow the test plan previously defined: - Stage a MARC record batch which contains at least one record match for something already in your catalog. - Locate the staged MARC record batch in Tools -> Manage staged records and click to view the contents. - Find the record which matched an existing record and click the "View" link in the Diff column. - The compare screen should include the header menu and breadcrumbs. The differences between your staged file and the existing record should be higlighted. - You should be able to return to the MARC batch you were previously viewing by following the link in the breadcrumbs or the link at the bottom of the page. - Confirm that the "About" page includes information about the new JavaScript plugin on the Licenses tab. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30797|0 |1 is obsolete| | Attachment #30798|0 |1 is obsolete| | Attachment #30799|0 |1 is obsolete| | Attachment #31847|0 |1 is obsolete| | --- Comment #12 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 31871 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31871&action=edit Bug 11876 - Add a diff view for staged MARC records. New patch should apply correctly. modified: C4/ImportBatch.pm modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt Signed-off-by: Owen Leonard <oleonard@myacpl.org> Bug 11876 - Diff column is now displayed. If a match is found, a 'View' link appears in the Diff column. Old patch was not implementing datatables, and therefore was not compatible with this version of Koha. modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt modified: tools/batch_records_ajax.pl Signed-off-by: Owen Leonard <oleonard@myacpl.org> These patches have some issues but I'm going to submit a follow-up which I think will address them all and offer some improvements as well. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 --- Comment #14 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 31873 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31873&action=edit Bug 11876 [Follow-up] Add a diff view to staged MARC Records This follow up makes some corrections to the previously added files and adds some functionality to the diff: A Javascript diff plugin highlights the differences between the records in the two columns. Corrections made: Converted tab indentation to spaces, corrected GPL statement. File organization: Moved showdiffmarc.pl and .tt to /tools/ to match the location of the page with which it functions, tools/manage-marc-import.pl. Corrected permissions on showdiffmarc.pl accordingly. Updates to the template: Added standard includes inclucing header menu and breadcrumbs; converted custom layout to YUI Grid standard. To test, follow the test plan previously defined: - Stage a MARC record batch which contains at least one record match for something already in your catalog. - Locate the staged MARC record batch in Tools -> Manage staged records and click to view the contents. - Find the record which matched an existing record and click the "View" link in the Diff column. - The compare screen should include the header menu and breadcrumbs. The differences between your staged file and the existing record should be higlighted. - You should be able to return to the MARC batch you were previously viewing by following the link in the breadcrumbs or the link at the bottom of the page. - Confirm that the "About" page includes information about the new JavaScript plugin on the Licenses tab. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@biblibre.co | |m --- Comment #16 from Jonathan Druart <jonathan.druart@biblibre.com> --- I tried to add readability to this patch set: 2 files were renamed and some code was added and removed later. I squashed 2 patches and renamed the files at their creation. I hope it's ok for everyone. Maxime, I don't understand why you get the title of the first imported record. What's happen if several records are imported? If you think the logic is good, you have to provide unit tests for this new routine. Which will be quite easy todo, it only retrieve columns in DB. It's the only concern I have on this enhancement. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 --- Comment #18 from Owen Leonard <oleonard@myacpl.org> --- I would be nice to see this make it into 3.18. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 --- Comment #20 from simith.doliveira@inlibro.com --- Created attachment 32987 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32987&action=edit unit test added -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #31871|0 |1 is obsolete| | Attachment #31872|0 |1 is obsolete| | Attachment #31873|0 |1 is obsolete| | Attachment #31874|0 |1 is obsolete| | Attachment #32995|0 |1 is obsolete| | --- Comment #22 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 33052 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33052&action=edit [PASSED QA] Bug 11876 - Add a diff view for staged MARC records. New patch should apply correctly. modified: C4/ImportBatch.pm modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt Signed-off-by: Owen Leonard <oleonard@myacpl.org> Bug 11876 - Diff column is now displayed. If a match is found, a 'View' link appears in the Diff column. Old patch was not implementing datatables, and therefore was not compatible with this version of Koha. modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt modified: tools/batch_records_ajax.pl Signed-off-by: Owen Leonard <oleonard@myacpl.org> These patches have some issues but I'm going to submit a follow-up which I think will address them all and offer some improvements as well. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 --- Comment #24 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 33054 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33054&action=edit [PASSED QA] Bug 11876 [Follow-up] Add a diff view to staged MARC Records This follow up makes some corrections to the previously added files and adds some functionality to the diff: A Javascript diff plugin highlights the differences between the records in the two columns. Corrections made: Converted tab indentation to spaces, corrected GPL statement. File organization: Moved showdiffmarc.pl and .tt to /tools/ to match the location of the page with which it functions, tools/manage-marc-import.pl. Corrected permissions on showdiffmarc.pl accordingly. Updates to the template: Added standard includes inclucing header menu and breadcrumbs; converted custom layout to YUI Grid standard. To test, follow the test plan previously defined: - Stage a MARC record batch which contains at least one record match for something already in your catalog. - Locate the staged MARC record batch in Tools -> Manage staged records and click to view the contents. - Find the record which matched an existing record and click the "View" link in the Diff column. - The compare screen should include the header menu and breadcrumbs. The differences between your staged file and the existing record should be higlighted. - You should be able to return to the MARC batch you were previously viewing by following the link in the breadcrumbs or the link at the bottom of the page. - Confirm that the "About" page includes information about the new JavaScript plugin on the Licenses tab. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 --- Comment #26 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 33056 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33056&action=edit [PASSED QA] Bug 11876 [Unit test] Add a diff view to staged MARC Records Unit test added http://bugs.koha-community.org/show_bug.cgi?id=11876 Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11876 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |tomascohen@gmail.com Severity|enhancement |new feature --- Comment #27 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Patches pushed to master. Nice feature! Thanks Fréférik and Maxime! -- You are receiving this mail because: You are watching all bug changes.