[Python-modules-commits] [python-django-treebeard] 08/17: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository python-django-treebeard.

commit d6a0dc32cc2e7a67bd01e065a2d9e9b92336f444
Merge: 0089680 802b81a
Author: Michael Fladischer <fladi at debian.org>
Date:   Wed Dec 30 20:34:57 2015 +0100

    merge patched into master

 CHANGES                                            |  10 ++
 PKG-INFO                                           |   5 +-
 debian/.git-dpm                                    |   6 +-
 ...eded-pytest-idmaker-hack.-Using-a-support.patch | 115 ---------------------
 ...sion-infromation-from-jquery-ui-filename.patch} |  20 ++--
 debian/patches/series                              |   3 +-
 django_treebeard.egg-info/PKG-INFO                 |   5 +-
 django_treebeard.egg-info/requires.txt             |   2 +-
 docs/_ext/djangodocs.py                            |  10 --
 docs/conf.py                                       |   8 +-
 docs/index.rst                                     |   2 +-
 docs/install.rst                                   |   2 +-
 docs/mp_tree.rst                                   |   2 +-
 setup.py                                           |   7 +-
 treebeard/mp_tree.py                               |   4 +-
 treebeard/ns_tree.py                               |   7 +-
 treebeard/templatetags/__init__.py                 |  41 +-------
 treebeard/templatetags/admin_tree.py               |  80 ++++++++------
 treebeard/templatetags/admin_tree_list.py          |  28 +++--
 treebeard/tests/jenkins/rm_workspace_coverage.py   |   5 +-
 treebeard/tests/jenkins/toxhelper.py               |   4 +
 treebeard/tests/settings.py                        |  15 ++-
 treebeard/tests/test_treebeard.py                  |  13 +++
 23 files changed, 148 insertions(+), 246 deletions(-)

diff --cc debian/.git-dpm
index a754b5b,0000000..9159ba2
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- f18987f0dc4358a03557bdb3c4ccfa8e65b6faa1
- f18987f0dc4358a03557bdb3c4ccfa8e65b6faa1
- af98fbee8a0b9a8aaed7b72463995b7f9ac74918
++802b81aecc7da82a4058bf2b78ae9b8e84b6947d
++802b81aecc7da82a4058bf2b78ae9b8e84b6947d
++02d1914271cd7f1807f85bfc1db0632cc5fe3133
 +02d1914271cd7f1807f85bfc1db0632cc5fe3133
 +python-django-treebeard_4.0+dfsg.orig.tar.gz
 +5b635a2406f890f4ec931bc47aa8069bfd432940
 +73678
diff --cc debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
index b9b1d0e,0000000..184b45b
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
+++ b/debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
@@@ -1,43 -1,0 +1,43 @@@
- From f18987f0dc4358a03557bdb3c4ccfa8e65b6faa1 Mon Sep 17 00:00:00 2001
++From 802b81aecc7da82a4058bf2b78ae9b8e84b6947d Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Wed, 30 Dec 2015 19:37:26 +0100
 +Subject: Remove version infromation from jquery-ui filename
 +
 + This package uses a symlink to the jquery-ui.min.js file provided by the
 + libjs-jquery-ui package. Removing the version information from the filename
 + makes it clearer that a system library is used and avoids confusion if the
 + version in the filename would diverge from the actual file version maintained
 + by the package.
 +Last-Update: 2015-09-08
 +Forwarded: not-needed
 +---
 + treebeard/templatetags/admin_tree.py | 2 +-
 + treebeard/tests/test_treebeard.py    | 2 +-
 + 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/treebeard/templatetags/admin_tree.py b/treebeard/templatetags/admin_tree.py
- index eee38b7..e8ede12 100644
++index 9794ac6..90cf6e2 100644
 +--- a/treebeard/templatetags/admin_tree.py
 ++++ b/treebeard/templatetags/admin_tree.py
- @@ -275,7 +275,7 @@ def treebeard_js():
-                   "(function($){jQuery = $.noConflict(true);})(django.jQuery);"
-                   "</script>"
-                   "<script type=\"text/javascript\" src=\"%s\"></script>")
++@@ -285,7 +285,7 @@ def treebeard_js():
++     """
++     path = get_static_url()
++     js_file = urljoin(path, 'treebeard/treebeard-admin.js')
 +-    jquery_ui = urljoin(path, 'treebeard/jquery-ui-1.8.5.custom.min.js')
 ++    jquery_ui = urljoin(path, 'treebeard/jquery-ui.min.js')
 + 
-      scripts = [SCRIPT_HTML % 'jsi18n',
-                 SCRIPT_HTML % js_file,
++     # Jquery UI is needed to call disableSelection() on drag and drop so
++     # text selections arent marked while dragging a table row
 +diff --git a/treebeard/tests/test_treebeard.py b/treebeard/tests/test_treebeard.py
- index 7f65239..fabef7e 100644
++index 65c9bb5..335e5a2 100644
 +--- a/treebeard/tests/test_treebeard.py
 ++++ b/treebeard/tests/test_treebeard.py
- @@ -2315,7 +2315,7 @@ class TestAdminTreeTemplateTags(TestCase):
++@@ -2328,7 +2328,7 @@ class TestAdminTreeTemplateTags(TestCase):
 +                     'jQuery = $.noConflict(true);'
 +                     '})(django.jQuery);</script>'
 +                     '<script type="text/javascript" '
 +-                    'src="/treebeard/jquery-ui-1.8.5.custom.min.js"></script>')
 ++                    'src="/treebeard/jquery-ui.min.js"></script>')
 +         assert expected == rendered
 + 
 +     def test_get_static_url(self):
diff --cc debian/patches/series
index 68ddc0a,0000000..6dc4abf
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 0001-Remove-unneeded-pytest-idmaker-hack.-Using-a-support.patch
- 0002-Remove-version-infromation-from-jquery-ui-filename.patch
++0001-Remove-version-infromation-from-jquery-ui-filename.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-treebeard.git