Skip to content

Commit

Permalink
Merge pull request #92 from openwisp/django2.2
Browse files Browse the repository at this point in the history
[deps] Added support for django 2.2
  • Loading branch information
nemesifier authored Dec 20, 2019
2 parents 2b5b627 + c92cf59 commit 3f62413
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ env:
- DJANGO="django>=1.11,<1.12"
- DJANGO="django>=2.0,<2.1"
- DJANGO="django>=2.1,<2.2"
- DJANGO="django>=2.2,<2.3"

matrix:
exclude:
- python: "2.7"
env: DJANGO="django>=2.0,<2.1"
- python: "2.7"
env: DJANGO="django>=2.1,<2.2"
- python: "2.7"
env: DJANGO="django>=2.2,<2.3"

branches:
only:
Expand All @@ -24,8 +27,6 @@ branches:
before_install:
- pip install --no-cache-dir -U -r requirements-test.txt
- flake8
- # TODO: remove after openwisp-utils > 0.2 is released
- pip install https://github.com/openwisp/openwisp-utils/tarball/master#egg=openwisp_utils --upgrade
- ./runcheckmigration
- if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then ./runisort; fi
- npm install -g jshint
Expand Down
6 changes: 4 additions & 2 deletions openwisp_users/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ class Meta(BaseUserCreationForm.Meta):
)

class Media:
js = ('openwisp-users/js/addform.js',)
js = ('admin/js/jquery.init.js',
'openwisp-users/js/addform.js',)


class UserChangeForm(EmailRequiredMixin, BaseUserChangeForm):
Expand Down Expand Up @@ -289,7 +290,8 @@ def has_change_permission(self, request, obj=None):

class Media:
css = {'all': ('openwisp-users/css/admin.css',)}
js = ('openwisp-users/js/uuid.js',)
js = ('admin/js/jquery.init.js',
'openwisp-users/js/uuid.js',)


class OrganizationUserAdmin(MultitenantAdminMixin, BaseOrganizationUserAdmin, BaseAdmin,):
Expand Down

0 comments on commit 3f62413

Please sign in to comment.