Bug 10649 - Upgrade DataTables and move scripts out of theme directory
Summary: Upgrade DataTables and move scripts out of theme directory
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Templates (show other bugs)
Version: master
Hardware: All All
: P5 - low normal (vote)
Assignee: Owen Leonard
QA Contact: Katrin Fischer
URL:
Keywords:
Depends on:
Blocks: 10651 10730
  Show dependency treegraph
 
Reported: 2013-07-26 13:01 UTC by Owen Leonard
Modified: 2014-12-07 20:02 UTC (History)
5 users (show)

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


Attachments
Bug 10649 - Upgrade DataTables and move scripts out of theme directory (123.85 KB, patch)
2013-07-26 15:20 UTC, Owen Leonard
Details | Diff | Splinter Review
[SIGNED-OFF] Bug 10649 - Upgrade DataTables and move scripts out of theme directory (123.84 KB, patch)
2013-07-29 03:54 UTC, Srdjan Jankovic
Details | Diff | Splinter Review
[SIGNED-OFF] Bug 10649 - Upgrade DataTables and move scripts out of theme directory (124.05 KB, patch)
2013-08-26 15:16 UTC, Owen Leonard
Details | Diff | Splinter Review
[PASSED QA] Bug 10649 - Upgrade DataTables and move scripts out of theme directory (125.18 KB, patch)
2013-08-28 21:37 UTC, Katrin Fischer
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Owen Leonard 2013-07-26 13:01:23 UTC
There is a new version of DataTables. I propose to incrementally replace references to the old plugin in intranet-tmpl/prog/en/lib/jquery/plugins to an upgraded version in intranet-tmpl/lib/jquery/plugins.

I also propose that templates load DataTables assets via an include file which will contain our customized configuration file (intranet-tmpl/prog/en/js/datatables.js), the translatable strings contained now in datatables-strings.inc, and the main DataTables library file.

This change affects a lot of files, so I plan to do this in batches, starting with Acquisitions-related templates. Once all templates have been corrected I'll remove the scripts in intranet-tmpl/prog/en/lib/jquery/plugins which are no longer needed.
Comment 1 Owen Leonard 2013-07-26 15:20:55 UTC Comment hidden (obsolete)
Comment 2 Srdjan Jankovic 2013-07-29 03:54:13 UTC Comment hidden (obsolete)
Comment 3 Srdjan Jankovic 2013-07-29 03:55:54 UTC
I got "YAHOO not defined" on the Receipt summary, but that's got nothing to do with this change I presume.
Comment 4 Jonathan Druart 2013-08-12 08:43:33 UTC
Owen, Could you explain why this patch adds dataTables.fnReloadAjax.js and jquery.dataTables.columnFilter.js?
Comment 5 Owen Leonard 2013-08-12 12:48:36 UTC
(In reply to Jonathan Druart from comment #4)
> Owen, Could you explain why this patch adds dataTables.fnReloadAjax.js and
> jquery.dataTables.columnFilter.js?

They already exist, I'm just copying them to the new location. I thought it was sensible to move them at the same time I moved the other DataTables library js even though the templates where they are used (detail.tt and quotes.tt) are not affected by this patch.
Comment 6 Jonathan Druart 2013-08-13 10:10:58 UTC
I think it is a great idea to have a dt.inc.
But I disagree with the idea to duplicate files. Particularly if catalogue/detail.tt and tools/quotes.tt are not modified.

I let someone else QA this patch.
Comment 7 Katrin Fischer 2013-08-25 19:55:03 UTC
Hi Owen, there is a small conflict in basketgroup.tt, but I am not sure how to solve it - could you rebase and switch back to signed off please?
Comment 8 Owen Leonard 2013-08-26 15:16:22 UTC Comment hidden (obsolete)
Comment 9 Katrin Fischer 2013-08-28 06:30:31 UTC
Currently working on this.
Comment 10 Katrin Fischer 2013-08-28 20:55:48 UTC
I am almost done with testing, but the last one gives me a lot of trouble, even with the patch for 10786 applied:

- Acquisitions -> Vendor -> Receive shipments -> Receipt summary (click
  invoice number)

/cgi-bin/koha/acqui/parcel.pl?invoiceid=2

Having almost 6.000 orders in that table might factor into that. Owen, could you take a look at 10786 and that page again?
Comment 11 Katrin Fischer 2013-08-28 21:37:59 UTC Comment hidden (obsolete)
Comment 12 Katrin Fischer 2013-08-28 21:39:17 UTC
(In reply to Katrin Fischer from comment #10)
> I am almost done with testing, but the last one gives me a lot of trouble,
> even with the patch for 10786 applied:
> 
> - Acquisitions -> Vendor -> Receive shipments -> Receipt summary (click
>   invoice number)
> 
> /cgi-bin/koha/acqui/parcel.pl?invoiceid=2
> 
> Having almost 6.000 orders in that table might factor into that. Owen, could
> you take a look at 10786 and that page again?

Using smaller result set and the patch from 10786 the page tested was ok.
Comment 13 Galen Charlton 2013-09-05 15:48:37 UTC
Pushed to master.  Thanks, Owen!
Comment 14 Galen Charlton 2013-09-05 15:49:04 UTC
Comment on attachment 20714 [details] [review]
[PASSED QA] Bug 10649 - Upgrade DataTables and move scripts out of theme directory

Setting back to assigned as this is an omnibus bug.
Comment 15 Galen Charlton 2013-09-05 16:56:31 UTC
Owen, I just looked at the bugs that you marked this one as blocking.  I'll leave it to you to indicate whether you want this one set back to 'pushed to master' (in which case, please open bugs for the remaining modules that need the new DataTables).
Comment 16 Owen Leonard 2013-09-11 15:39:17 UTC
I will be opening separate bugs for the other modules, so this can be "pushed to master," thanks.
Comment 17 Jonathan Druart 2013-09-20 08:45:32 UTC
(In reply to Owen Leonard from comment #16)
> I will be opening separate bugs for the other modules, so this can be
> "pushed to master," thanks.

Ping Galen