Summary: | Checkout History Sort | ||
---|---|---|---|
Product: | Koha | Reporter: | Srdjan Jankovic <srdjan> |
Component: | Circulation | Assignee: | Srdjan Jankovic <srdjan> |
Status: | CLOSED FIXED | QA Contact: | Ian Walls <koha.sekjal> |
Severity: | enhancement | ||
Priority: | P5 - low | CC: | chris, gmcharlt, kyle.m.hall, nengard, paul.poulain |
Version: | 3.8 | ||
Hardware: | All | ||
OS: | All | ||
Change sponsored?: | --- | Patch complexity: | --- |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: | ||
Circulation function: | |||
Bug Depends on: | 5345 | ||
Bug Blocks: | |||
Attachments: |
patch
patch bug_7647: Table sorter on issue history |
Description
Srdjan Jankovic
2012-03-06 00:16:33 UTC
Created attachment 8023 [details] [review] patch I don't think we should be adding new instances of the tablesorter plugin when we're trying to switch to DataTables (Bug 5345 - DataTables in Koha). Created attachment 8677 [details] [review] patch nengard@kohavm:~/kohaclone$ git bz apply 7647 Bug 7647 - Checkout History Sort patch Apply? [yn] y Applying: bug_7647: Table sorter on issue history error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt:1 error: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt: patch does not apply Patch failed at 0001 bug_7647: Table sorter on issue history When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Patch left in /tmp/patch-v09mXq.patch nengard@kohavm:~/kohaclone$ (In reply to comment #4) > nengard@kohavm:~/kohaclone$ git bz apply 7647 > Bug 7647 - Checkout History Sort > > patch > Apply? [yn] y > > Applying: bug_7647: Table sorter on issue history > error: patch failed: > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt:1 > error: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt: > patch does not apply > Patch failed at 0001 bug_7647: Table sorter on issue history > When you have resolved this problem run "git am --resolved". > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort". > Patch left in /tmp/patch-v09mXq.patch > nengard@kohavm:~/kohaclone$ Don't forget to try git am -3. The patch actually applies fine with three-way merge. If you look at the last few lines, it actually gives you a hint of what to do next. You run the following two commands: git am --abort git am -3iu /tmp/patch-v09mXq.patch There's also a patched version of git-bz that takes care of that for you which you could download (I don't recall exactly wherefrom). Created attachment 9438 [details] [review] bug_7647: Table sorter on issue history Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Adds DataTables to item issue history to be more consistent with what we see on patron checkout history. Template only, with some javascript libraries. Marking Passed QA. Will be in 3.8.1 |