Commit Graph

808 Commits

Author SHA1 Message Date
Ross Poulton
ed3884a919 Merge pull request #373 from flinz/master-upstream
Add HELPDESK_ENABLE_PER_QUEUE_MEMBERSHIP to discontinued settings;
2015-12-22 09:39:35 +11:00
Ross Poulton
62b635df81 Merge pull request #370 from alexbarcelo/admin-fixes
Making Queue slug unique and improving certain admin-related behaviour
2015-12-22 09:30:29 +11:00
Alex Seeholzer
a5c05cff74 added HELPDESK_ENABLE_PER_QUEUE_MEMBERSHIP to discontinued settings; 2015-12-21 13:58:28 +01:00
Alex Barcelo
7894eea1e1 Making Queue slug unique and improving certain admin-related behaviour 2015-12-18 14:56:53 +01:00
Alex Barcelo
3b547d2cf9 creation of Permission-per-Queue is done always 2015-12-18 14:35:50 +01:00
Ross Poulton
b2ae5e764f Merge pull request #367 from alexbarcelo/permission_access4
Usage of [contrib.auth.models.]Permission instead of [helpdesk.models.]QueueMembership
2015-12-18 08:51:20 +11:00
Alex Barcelo
4545fc925f fixing migration and allowing valid rollback on typical migrations 2015-12-17 18:44:10 +01:00
Alex Barcelo
0b5af429a5 reverting error due to methods and migrations 2015-12-17 18:11:54 +01:00
Alex Barcelo
01598826bf protecting through 403 several staff views 2015-12-16 22:27:06 +01:00
Alex Barcelo
1ea70ad1be adding management command for batch-creation of Queue permission 2015-12-16 22:27:06 +01:00
Alex Barcelo
43e5ff7c0e added delete mechanism on Queue for auto-clean of permissions 2015-12-16 22:27:06 +01:00
Alex Barcelo
92d8ca3eff more modular management of permission codenames 2015-12-16 22:27:06 +01:00
Alex Barcelo
830fcbe796 updating documentation regarding membership/permission 2015-12-16 22:27:06 +01:00
Alex Barcelo
64bc1791d4 removing completely QueueMembership model 2015-12-16 22:27:06 +01:00
Alex Barcelo
d760d9ee95 adding basic information to tickets, and masking email, on the admin views 2015-12-16 22:27:06 +01:00
Alex Barcelo
fb66fea86e change basic features of membership into permissions 2015-12-16 22:27:05 +01:00
Alex Barcelo
230d14b3ca removing QueueMembership mechanisms from admin.py 2015-12-16 22:27:05 +01:00
Alex Barcelo
c1fd47043a migration for removing semantics from QueueMembership objects 2015-12-16 22:27:05 +01:00
Alex Barcelo
18c7a2e698 adding required model extra info for permissions 2015-12-16 22:27:05 +01:00
Ross Poulton
87ecd34610 Merge pull request #366 from alexbarcelo/migration_for_bugfix
adding migration for bugfix 'changed max_length given by string to integer;'
2015-12-17 07:17:36 +11:00
Ross Poulton
9a8c93fb30 Merge pull request #364 from flinz/bug/travis-build-fails
Change supported django+python versions
2015-12-17 07:16:42 +11:00
Alex Barcelo
c0939d4b38 adding migration for bugfix 'changed max_length given by string to integer;' 2015-12-16 16:37:22 +01:00
Alex Seeholzer
87d1354020 Updated doc and requirements:
- Dj1.7 + Py3.5 is not supported
- Dj>1.6 is required
2015-12-16 10:52:20 +01:00
Alex Seeholzer
265da65ead Removed Python3.5 + Django 1.7.11 from travis build targets (non-supported combination) 2015-12-16 10:48:18 +01:00
Alex Seeholzer
4e2e517821 changed build target to 3.4+ (3.3 support is dropped for Django 1.8+);
changed doc to reflect this;
2015-12-16 10:26:29 +01:00
Ross Poulton
11467f6e50 Properly check email context keys in newer Python versions. part of #362 2015-12-16 10:48:27 +11:00
Ross Poulton
9c249a818b Update docs & tests for Python 2.7/3.3+ and Django 1.7+ 2015-12-16 10:35:00 +11:00
Ross Poulton
6187b0568c Merge pull request #358 from flinz/django-1.9-fixes
Django 1.9 compatibility
2015-12-16 10:24:16 +11:00
Ross Poulton
cee87eb50d Merge pull request #356 from flinz/python3
Python3 compatibility
2015-12-16 10:22:51 +11:00
Alex Seeholzer
54e541230e Merge branch 'bug/360_max-length-given-by-string' into django-1.9-fixes
* bug/360_max-length-given-by-string:
  changed max_length given by string to integer;
2015-12-15 10:21:04 +01:00
Alex Seeholzer
905e52e603 changed max_length given by string to integer; 2015-12-15 10:11:47 +01:00
Alex Seeholzer
2da16c511c updates to remove Django 1.10 deprecation warnings in Django 1.9:
- use of patterns() in urls.py is deprecated
- render() functions accept only dicts - introduced checks to ensure downward compatibility back to Django 1.7
2015-12-10 13:36:24 +01:00
Alex Seeholzer
8d55dcb9a0 python 2 & 3 compatibility: changed __unicode__ to __str__ and added python2 decorators (https://docs.djangoproject.com/en/1.8/topics/python3/#str-and-unicode-methods) 2015-11-18 15:26:08 +01:00
Alex Seeholzer
8390125c01 fixes of python 3 test fails 2015-11-18 15:07:33 +01:00
Alex Seeholzer
71504aa85d minor changes for python3 2015-11-18 10:41:02 +01:00
Alex Seeholzer
f7f0882f86 Merge branch 'master-upstream' into django-1.9-fixes
* master-upstream:
  Fix QueueMembership bug revealed by django.test's DiscoverRunner
2015-11-18 10:16:33 +01:00
Ross Poulton
aae2501cab Merge pull request #354 from reduxionist/bug/per-queue-membership-but-no-memberships
Fix QueueMembership bug revealed by django.test's DiscoverRunner
2015-11-17 12:00:19 +11:00
Alex Seeholzer
a906af3676 warnings about app_labels: reordered quicktest and added sites to INSTALLED_APPS 2015-11-16 16:10:58 +01:00
Alex Seeholzer
e732b511e1 deprecated tags replaced in django 1.9 (ssi and url template tags are removed from the future template tag library) 2015-11-16 16:09:47 +01:00
Alex Seeholzer
307e9446a2 ensure tests for ticket submission run correctly in django 1.9 (URI's no longer include the scheme and domain part of the URLs) 2015-11-16 16:08:52 +01:00
Jonathan Barratt
0610a6645d Fix QueueMembership bug revealed by django.test's DiscoverRunner
If HELPDESK_ENABLE_PER_QUEUE_STAFF_MEMBERSHIP was True but a user had
no QueueMembership entries, then restricting queue access generated
RelatedObjectDoesNotExist exceptions.

 - Ask for forgiveness whenever we try to limit a queryset by the
queuemembership related object set.

 - Since tests can now be run with the project's settings active,
rather than only with quicktest.py's settings, restore the initial
HELPDESK_ENABLE_PER_QUEUE_MEMBERSHIP value after having tested the
related functionality.
2015-11-16 18:45:27 +07:00
Ross Poulton
ddd5b21b45 Merge pull request #352 from ssadler/static_from_staticfiles
use staticfiles app instead of STATIC_URL
2015-11-15 12:25:42 +11:00
Ross Poulton
0d995e0235 Merge pull request #351 from flinz/django-1.8
Django 1.8 compatibility including updated testrunners
2015-11-15 12:25:08 +11:00
Scott Sadler
2663a5e5ba use staticfiles app instead of STATIC_URL 2015-11-13 16:58:28 +01:00
Alex Seeholzer
0399612e57 bugfix: migration dependency corrected 2015-11-13 16:03:13 +01:00
Tony Zhu
dbdaca8dd4 django 1.8 email field size migration 2015-11-13 15:50:22 +01:00
Tony Zhu
0b0f946389 Add the migration for changes in queues
This is the missing migration for commit
9600f457d8
2015-11-13 15:50:22 +01:00
Alex Seeholzer
27c519f2ee downwards compatibility for django < 1.8 2015-11-13 15:36:04 +01:00
Alex Seeholzer
cd0daccb56 tests are correctly discovered for django < 1.6 2015-11-13 15:35:36 +01:00
Alex Seeholzer
50877c3708 Trying to fix travis build error & more general test imports: all files with test_*.py are imported from the /tests directory; 2015-11-13 14:07:36 +01:00