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
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
Alex Seeholzer
8f585aef1c
Merge commit 'a4e6f086c8928e77baa73a25b7e8000fb6261498' into django-1.8
...
* commit 'a4e6f086c8928e77baa73a25b7e8000fb6261498':
Include attachments to cc'd users on ticket update
From gettatr to get, because dict doesn't contatin attributes. More readable if statement.
2015-11-13 13:50:11 +01:00
Ross Poulton
a4e6f086c8
Merge pull request #350 from ssadler/updated_cc_attachments
...
Include attachments to cc'd users on ticket update
2015-11-13 08:20:26 +11:00
Scott Sadler
98ad8567b9
Include attachments to cc'd users on ticket update
2015-11-12 15:53:16 +01:00
vlad.vyazovetskov
0a3171a024
From gettatr to get, because dict doesn't contatin attributes.
...
More readable if statement.
2015-11-12 17:31:14 +03:00
Scott Sadler
2681f6340c
fix reload_urlconf test helper so it supports a third party urlconf
2015-11-06 15:22:44 +01:00
Scott Sadler
e82c17567a
Merge branch 'master' into django-1.8
...
Conflicts:
helpdesk/tests/__init__.py
2015-11-06 14:50:33 +01:00
Alex Seeholzer
163a0524b1
Merge branch 'master' into django-1.8
...
* master:
renamed test __init__.py imports to new test naming scheme
2015-06-25 16:54:15 +02:00
Ross Poulton
48d1feb69d
Merge pull request #334 from pahpa/master
...
Modify make_option with dest variable 'escalate-verbosely'
2015-06-19 09:25:40 +10:00
pahpa@orange.fr
060266e93a
Modify make_option with dest variable 'escalate-verbosely'
2015-06-17 16:22:44 +02:00
Alex Seeholzer
f9682ccf37
renamed test __init__.py imports to new test naming scheme
2015-06-12 15:52:35 +02:00
Alex Seeholzer
da30d2b973
tests renamed for compliance
2015-06-12 15:48:38 +02:00
Alex Seeholzer
87225ce2ba
tests renamed for compliance
2015-06-12 15:27:49 +02:00
Alex Seeholzer
cbea3c54f0
conformed template from_string method to use engines['django']
2015-06-12 12:54:50 +02:00
Alex Seeholzer
0b7e0b7f04
changes in templating engine that worked for django 1.8
2015-06-12 12:52:35 +02:00
Alex Seeholzer
039653cc70
further fixes for Django 1.8.2 template engine
2015-06-12 12:52:34 +02:00
Alex Seeholzer
0f69771164
fix for django 1.8.2, get_template_from_string was removed
2015-06-12 12:52:34 +02:00
Alex Seeholzer
42f478b98c
Merge squashed fixes from flinz/per-queue-staff-membership:
...
-renamed migration 0005 to 0004 and referenced 0003 instead of 0004 from it.
-Corrected spelling and rephrased docs for queue membership feature.
2015-06-12 17:41:15 +07:00
Jonathan Barratt
bfcd8fc024
Add ability to restrict users' access by queue if so configured, and migration and tests for same.
2015-06-12 12:23:39 +07:00
Jonathan Barratt
711eb6cea2
As of at least Django 1.5, calling __str__() on a CHOICES object returns a proxy object, not the actual text of the CHOICE. Change such calls to title() instead
2015-06-11 14:31:49 +07:00
Ross Poulton
6595eebd3f
Merge pull request #328 from reduxionist/fix-squashed-socks_proxy-migration
...
Remove migration 0002_socks_proxy.py...
2015-06-10 09:35:10 +10:00
Jonathan Barratt
9c60350193
Fix issue 286: Header cuts off body by replacing {{ STATIC_URL }}x with {% static "x" %} in {public_,}base.html
2015-06-03 14:37:21 +07:00
Jonathan Barratt
f434292cfc
Remove migration 0002_socks_proxy.py which has been squashed into 0001, rename migrations 0003 and 0004 and update their dependencies accordingly
2015-06-03 12:39:02 +07:00
Emmanuel Cohen
b0db7aa666
Fix exeception for templetags (works on django 1.7/py3.4 & django 1.6/py2.7)
2015-04-28 14:50:49 +02:00
Ross Poulton
70c57f9096
Merge
2015-04-28 09:13:54 +10:00
Tony Zhu
ed9581e5de
Remove deprecated load url from future
2015-04-16 11:58:24 -04:00
Tony Zhu
807e0c5ea9
Remove extra space line
2015-04-14 16:29:47 -04:00
Tony Zhu
9600f457d8
Remove no effect model property to silence django 1.8 system check warning
2015-04-14 16:25:20 -04:00
Tony Zhu
11e4f1a7bd
Merge upstream changes
2015-04-14 16:10:13 -04:00
Ross Poulton
bb2c240ef8
Use proper URL names for hold/unhold rather than manually building URL. Fixes #299
2015-02-14 11:13:19 +11:00
Ross Poulton
19ec7bee96
Extend attachment filefield max length in upload form. Fixes #301 .
2015-02-14 11:02:58 +11:00
Alex Seeholzer
4ba29c500c
Merge branch 'bugfix_models'
...
* bugfix_models:
bug fix for commit
2015-02-11 13:25:52 +01:00
Alex Seeholzer
ddabc9d133
bug fix for commit
2015-02-11 13:23:42 +01:00
Alex Seeholzer
4c89456bc1
Merge branch 'populate_usersettings'
...
* populate_usersettings:
Added south migration to populate the initially existing users with usersettings.
2015-02-11 13:14:55 +01:00
Alex Seeholzer
a11227c6c1
Added south migration to populate the initially existing users with usersettings.
2015-02-11 13:14:36 +01:00
Alex Seeholzer
9665361bb1
In Django < 1.7, if settings.AUTH_USER_MODEL is defined, the sender is expected to be the actual instance, not a string. This Closes rossp/django-helpdesk#295 by checking for django version < 1.7.
2015-02-11 12:23:59 +01:00
Alex Seeholzer
a87e1355ee
Added missing south migration, adding the missing fields 'helpdesk_queue.socks_proxytype'. This fixes rossp/django-helpdesk#291 .
2015-02-10 17:30:32 +01:00
Simon Thépot
83affccec5
Specify features to load in failing testcase for django < 1.7
2015-01-14 16:00:35 +01:00
Simon Thépot
b53d3ad9bc
Rename initial_data.json to emailtemplate.json
2015-01-14 15:49:08 +01:00
Simon Thépot
f68c1b3ae9
Django1.7 tests: load initial_data w/ migration
2015-01-14 15:36:37 +01:00
Simon Thépot
f0156cfcb3
Populate user settings w/ data migration, Django1.7 compatible, fix #276
2015-01-14 11:19:17 +01:00
TreeNode
ae681dd5d3
Clear host and port if no proxy type was set
2014-12-11 12:03:36 +02:00
