← Back to branch summary

~replaceafill/ubuntu/trusty/schooltool/2.8_custom-css

« back to all changes in this revision

Viewing changes to src/schooltool/report/report.py

  • Committer: Gediminas Paulauskas
  • Date: 2014-05-08 15:13:41 UTC
  • mfrom: (1.1.34)
  • Revision ID: menesis@pov.lt-20140508151341-wcsbt3m1lxbrc90x
Tags: 1:2.8.0-0ubuntu1
* New upstream release.
* debian/patches/ckeditor4.patch: remove, fixed upstream.
* debian/copyright: add a section for included d3 javascript library.
* debian/missing-sources: add sources for included javascript libraries:
  - d3 2.9.7
  - jquery 1.7.1
  - jquery-scrollto 1.4.2
  - jquery-ui 1.8.18

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/schooltool/report/report.py
327
327
        if locale_id is not None:
328
328
            self.locale = zope.i18n.locales.Locale(locale_id)
329
329
        cookies = getattr(params, 'cookies', None)
330
 
        if self.cookies is not None:
 
330
        if self.cookies is not None and cookies is not None:
331
331
            self.cookies.update(cookies)
332
332
 
333
333
    def clone(self):