Commit Graph

412 Commits

Author SHA1 Message Date
Benbb96
238dd8d3d5 Fix import order 2022-08-15 20:21:19 +02:00
Benbb96
bc3d89b555 Fix PyCharm warnings in staff.py 2022-08-15 20:15:02 +02:00
Martin Whitehouse
72392a3f50
Add update_summary_tables helper function
Reduces complexity of 'run_report' and handles updating summary table in
own function
2022-07-25 04:44:46 +02:00
Martin Whitehouse
205c69b539
Add get_report_table_and_totals helper function
Extracts a large portion of run_report handling
2022-07-25 04:41:01 +02:00
Martin Whitehouse
b1bf2cab46
Add get_report_queryset_or_redirect helper
Gets required objects or redirects
2022-07-25 04:35:49 +02:00
Martin Whitehouse
50bd72ac7a
Move import to top 2022-07-25 04:31:17 +02:00
Martin Whitehouse
d858c40416
Add check_redirect_on_user_query helper function
Extract the checking for a redirect to reduce complexity
2022-07-25 04:29:43 +02:00
Martin Whitehouse
f89f5b91da
Reinstate changes, fixed missing update 2022-07-25 04:23:03 +02:00
Martin Whitehouse
40a243c23b
Revert changes, updating objects missed somewhere 2022-07-25 04:15:53 +02:00
Martin Whitehouse
a248181857
Add redirect_from_chosen_ticket helper function
Moves the whole handling to own block, reducing complexity greatly.
2022-07-25 04:08:16 +02:00
Martin Whitehouse
eb11c4fe0e
Rename ticket_attriubtes to upper, module level constant. 2022-07-25 04:03:12 +02:00
Martin Whitehouse
a783156b61
Add merge_ticket_values helper
Extract a large portion of code from `merge_tickets`
2022-07-25 04:01:27 +02:00
Martin Whitehouse
b326103d82
Fix spacing 2022-07-25 03:48:06 +02:00
Martin Whitehouse
45e47846fe
py3.8 annotation fix 2022-07-25 03:45:36 +02:00
Martin Whitehouse
7b4d53cfc0
Fix 'list' annoation for py3.8 2022-07-25 03:44:04 +02:00
Martin Whitehouse
749ebbe16b
Fix annotations for py3.8 2022-07-25 03:42:16 +02:00
Martin Whitehouse
595dae1cf7
Add get_template_staff_and_template_cc function
Furhter reduxes complexity by combining creation of templates
2022-07-25 03:38:16 +02:00
Martin Whitehouse
256af24daa
Comment function 2022-07-25 03:34:03 +02:00
Martin Whitehouse
a2f33c9799
Add add_staff_subscription helper
Further reduces complexity by checking for subscription in helper
function
2022-07-25 03:32:45 +02:00
Martin Whitehouse
f678c63496
Add update_messages_sent_to_by_public_and_status helper function
Handles updating ticket and sending ticket reply
2022-07-25 03:30:07 +02:00
Martin Whitehouse
fe619b5ff2
Combine conditionals to single line 2022-07-25 03:22:59 +02:00
Martin Whitehouse
f815ebbb5c
Add get_time_spent_from_request helper
Extracts further code
2022-07-25 03:17:10 +02:00
Martin Whitehouse
9294eca5d6
Add get_and_set_ticket_status helper
Extracts some futher code from `update_ticket`
2022-07-25 03:11:30 +02:00
Martin Whitehouse
ecefd5e407
Extract the due_date to helper function 2022-07-25 03:01:50 +02:00
Martin Whitehouse
574395ee28
Easy pickings
Simple code violations of reserved symbols etc.
2022-07-25 02:46:33 +02:00
Martin Whitehouse
44f068d1b8
re-apply formatting 2022-07-22 03:30:35 +02:00
Martin Whitehouse
25542f929e
Initial isort configuration
Will fail build if imports are not sorted correctly
2022-07-22 03:26:41 +02:00
Martin Whitehouse
b586442508
Merge branch 'stable' of
git@github.com:superuser-marty-me-uk/django-helpdesk.git into formatting
2022-07-13 10:22:11 +02:00
Martin Whitehouse
aa876f8016
pycodestyle formatting 2022-07-12 12:34:19 +02:00
Benbb96
9dbe283dd4 Create FollowUpAttachment serializer + handle attachment in TicketSerializer and in FollowUpSerializer in order to attach directly one or multiple attachments to the created followup. 2022-06-24 23:45:26 +02:00
Benbb96
bd413837c2 Create FollowUp serializer with its Viewset and add it in urls 2022-06-24 22:22:08 +02:00
Garret Wassermann
ee42ba48a3 Merge in bugfixes from 0.3.5 2022-06-12 03:00:25 -04:00
Daniele Scasciafratte
67949e83f9
added permission classes 2022-05-04 18:51:02 +02:00
Daniele Scasciafratte
25db44ba5e feat(rest): create user 2022-05-02 17:27:25 +02:00
Garret Wassermann
b8511dd70b Fix conflicts for Django 4 support 2022-04-23 02:23:51 -04:00
Daniele Scasciafratte
5792587e3e feat(ticket): disable timeline 2022-04-15 18:48:21 +02:00
Garret Wassermann
2b33de6b37
Merge branch 'stable' into api-solution-1 2022-03-31 20:25:59 -04:00
bbe
e2cb881eb8 Create an API endpoint to list/create/update/delete tickets (ignoring custom fields) 2022-03-31 17:32:14 +02:00
bbe
1daa1d88aa Create an API endpoint to list/create/update/delete tickets (including custom fields !) + Refactoring in forms.py 2022-03-31 17:19:49 +02:00
Daniele Scasciafratte
7a3260a163 fix(kb): no db 2022-03-18 19:33:31 +01:00
Daniele Scasciafratte
347a70e497 fix(kb): no db 2022-03-18 19:21:17 +01:00
Nick McCullum
358080926c Added Django 4 support. 2022-03-16 22:29:09 -04:00
Antun Franjin
fbadf23654 Fix typo in model field name in update_ticket.
email_on_ticket_assigned > email_on_ticket_assign
2022-03-11 11:03:16 +01:00
Garret Wassermann
3695cfa19d
Remove comma in staff.py to address #988 2022-01-04 11:47:31 -05:00
Garret Wassermann
aff67184d4 Add attachment validator when uploading attachment to tickets 2021-10-05 06:25:42 -04:00
Garret Wassermann
a5f801bb52 use csrf tokens in all forms 2021-10-04 23:13:38 -04:00
Timothy Hobbs
63bb949d63 Don't use redis cache at all for ticket querysets as this breaks pagination 2021-07-07 20:40:34 +02:00
Timothy Hobbs
f840136e1e Don't crash if use email is None 2021-07-07 20:38:20 +02:00
Arkadiy Korotaev
c90811418a
chore(pep8): Fix bad imports, unused variables, pep8 warnings and some possible bugs 2021-03-05 09:37:21 +01:00
Arkadiy Korotaev
1713a86870
feat(forms): Ability to provide custom public ticket form 2021-03-02 12:06:21 +01:00
Tom Weber
90961897ec CustomField datetime type formats updated to fixed string formats enabling reformatting and consistency 2021-02-10 17:58:01 -07:00
Tom Weber
ae9109bad6 Bug Fix EditTicketForm unable to edit and add error display 2021-02-09 13:08:27 -07:00
bbe
2a03a5ecf7 Disabled merged_to field in edit ticket + reformat template (fix datepicker) and simplify view 2021-02-04 18:17:06 +01:00
Garret Wassermann
c9fa0c81c7
Merge pull request #895 from Benbb96/merging-tickets-feature
New feature:  Merging tickets
2020-11-01 13:54:03 -05:00
bbe
1788f2fb84 Update ticketCC views and also reformat HTML files along with some improvements in form errors. 2020-10-31 18:33:41 +01:00
bbe
ad55d54f2d Update french translations 2020-10-31 00:15:51 +01:00
bbe
b3bd23dbff Add assigned_to attribute to be merged 2020-10-30 23:12:09 +01:00
bbe
41b5715b7d Add comments and refactor variables names 2020-10-30 22:19:21 +01:00
bbe
e1cd9d0f2e Implement ticket merge feature in ticket list. Create intermediate page to choose which data and custom field values to keep on the main ticket.
Also add new template tag filter to use the dictionary get function in template.
2020-10-29 23:32:02 +01:00
bbe
64a3b146d3 Merge branch 'master' of https://github.com/django-helpdesk/django-helpdesk into master 2020-10-23 16:40:13 +02:00
bbe
4ee74e6667 Better public create ticket form with the initialization of the datepicker for due date as a media.
Reformat code to improve readability.
Add an include to get an alert when there are errors in a form.
2020-10-23 16:23:47 +02:00
bbe
dc503b0437 Fix #739 2020-10-23 14:51:53 +02:00
Thomas Weber
58a23fed13 Check user is authenticated and usersettings_helpdesk model is created before attempting to read a tickets_per_page, otherwise use default value 2020-10-13 13:01:18 -06:00
Garret Wassermann
df4024dbb3
Merge branch 'master' into master 2020-10-13 03:38:36 -04:00
Garret Wassermann
c9e0a51d78
Merge pull request #881 from Benbb96/fix-errors-on-master
Fix errors on 0.3.x branch especially relating to django 3.x
2020-10-13 03:35:42 -04:00
alligatorbait
e50225a67c remove missing import and usage of apply_query 2020-10-12 15:57:00 -06:00
Garret Wassermann
6b335590e6 Merge bugfixes from 0.2.23-devel 2020-10-12 03:19:46 -04:00
Benbb96
d7f4ca4137 Fix the call the user setting for tickets per page 2020-10-08 22:34:40 +02:00
Benbb96
d80c70735a Remove unused imports and fix errors like variables which were removed or renamed or call to function apply_query which doesn't exist anymore. 2020-10-08 22:07:49 +02:00
Garret Wassermann
720860fe54
Merge pull request #869 from alligatorbait/0.2.x
Verify ticket.assigned_to is set before attempting to access id property
2020-10-08 01:26:10 -04:00
Benbb96
ecc7dcdc17 Fix tests 2020-10-08 00:48:03 +02:00
bbe
bcec57dafe Display total row in report output. 2020-10-05 11:15:22 +02:00
Thomas Weber
b772c6097b Verify ticket.assigned_to is set before attempting to access id property 2020-08-25 16:11:50 -06:00
Timothy Hobbs
ba321462c3
Attempted fix for #849
Probably fixes #849
2020-08-07 13:03:16 +02:00
Garret Wassermann
2f788f2597 Merge 0.2.22 bugfix release updates, update copyright year in license, specify python 3.6 or above in setup 2020-07-30 04:46:15 -04:00
Arkadiy Korotaev
cf98b4a8e9
fix(public): Fix the public ticket creation by passing user or None to the form.save() method 2020-07-20 16:43:55 +02:00
bbe
ff77aa0fe3 A ticket cannot depends on itself or on a ticket already depending on it 2020-06-12 15:34:39 +02:00
bbe
25a2e5130b Update French Translations 2020-06-09 16:18:09 +02:00
Tom Bernens
e10ffce24a more safely get the user setting for tickets per page 2020-06-01 16:20:33 -07:00
Tom Bernens
03760a921e initial commit
staff.py changes:
import django core paginator libs
get user setting for tickets per page
get http GET variables for page selection on three tables
use django paginator to get current page tickets only, and pass those to dashboard.html instead of all tickets

dashboard.html changes:
assign the correct HTTP GET argument to each table

tickets.html changes:
add pagination controls below table div, and pass HTTP GET args back to the URL when clicked
2020-06-01 16:14:55 -07:00
Garret Wassermann
8a521d563b Fix pycodestyle error 2020-04-15 07:42:52 -04:00
Garret Wassermann
5ad0743722 Merge in 0.2.21 bugfix 2020-04-15 07:38:52 -04:00
Garret Wassermann
0e9358e61b
Merge pull request #803 from auto-mat/teams
Add Teams functionality, using pinax-teams
2020-03-04 01:02:40 -05:00
Andrew Denisenko
2f4d91c22d Fill followup user field if authenticated user submits ticket 2020-03-03 23:39:02 +02:00
Petr Dlouhý
93e82f5469 allow KBItems to be disabled for users 2020-02-25 14:46:21 +01:00
Timothy Hobbs
28531144db Use default str for displaying kbitems in filter view 2020-02-11 17:11:41 +01:00
Timothy Hobbs
bb9d886eea Fix query by uncatigorized 2020-02-11 16:44:18 +01:00
Arkadiy Korotaev
354debb618
fix<public>: Public ticket creation form improvements
Update forms.py and views/public.py to physically delete form fields
instead of just hiding them if default values for queue, date and priority are provided.

+ some bugfixes
+ code and stale imports removal
+ fix pep8 errors
2020-02-06 10:10:07 +01:00
Timothy Hobbs
f8c652d506 Better filtering + optional columns in ticket list view 2020-02-03 14:17:19 +01:00
Timothy Hobbs
5b0d44ec3a Assign KBItems to teams
This allows you to only show on the dashboard those tickets which belong to a
given user's team.
2020-01-27 19:45:15 +01:00
Timothy Hobbs
eea76a5eb7 Do not include resolved tickets in default ticket query 2020-01-27 17:56:49 +01:00
Timothy Hobbs
ecbb91b861 Private kb categories 2020-01-27 17:37:59 +01:00
Timothy Hobbs
2f8b4acf64 Fix pycodestyle errors 2020-01-20 14:17:23 +01:00
Timothy Hobbs
df94b56b07 Fix success view 2020-01-20 13:23:32 +01:00
Timothy Hobbs
cd019d1128 Improvements to iframe workflow 2020-01-20 13:23:32 +01:00
Timothy Hobbs
07a42e07f8 Made iframe ticket submit view CSRF exempt. Hopefully this is secure! 2020-01-20 13:23:31 +01:00
Timothy Hobbs
4c1fda5991 Fix iframe views so they actually can be displayed 2020-01-20 13:23:31 +01:00
Timothy Hobbs
b20f600db2 KB UX improvements 2020-01-20 13:23:31 +01:00
Timothy Hobbs
05bd852799 Fix pycodestyle errors 2020-01-20 13:23:31 +01:00
Timothy Hobbs
6a8ebd56a0 Add iframe view of KB categories 2020-01-20 13:23:31 +01:00