bbe
1b8a11f74b
Create test for the merge view
2020-10-30 23:17:40 +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
00a18d8f54
Restrict possible tickets to merge to the ones that haven't been already merged.
...
Also check that all selected tickets are within the same queue.
2020-10-30 20:19:50 +01:00
bbe
da5028d51a
Redirect e-mail for a merged ticket to the ticket it has been merged to
2020-10-30 19:59:16 +01:00
bbe
ffc51f5e8e
Show line breaks in custom field values (when multi lines)
2020-10-30 19:58:01 +01:00
bbe
e8f6756750
Add newline in text part before the footer when sending mail
2020-10-30 19:57:23 +01:00
bbe
5fce1964de
Add email template "merged" thanks to a migration and add merged_to field into the safe ticket context.
2020-10-30 19:56:38 +01:00
bbe
41c1e765c2
add default empty when a ticket custom field value is null
2020-10-29 23:33:22 +01:00
bbe
49735dbcda
Reformat ticket page and show in which ticket it has been merged to
2020-10-29 23:32:51 +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
9795167d9b
Add merged_to information to ticket
2020-10-29 23:29:16 +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
58a5387779
Show Due date on public view ticket if it is set.
...
Also change default to empty string when a custom field value is None.
2020-10-23 16:24:35 +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
Garret Wassermann
ab5e07e295
Merge pull request #892 from Benbb96/master
...
Display custom fields with bootstrap `form-control` css class
2020-10-20 12:11:10 -04:00
bbe
ea558d71f3
Display custom fields with bootstrap form-control css class
2020-10-20 11:51:55 +02:00
Garret Wassermann
c0f1370974
Remove merge text accidentally left in, for #889
2020-10-15 14:35:33 -04:00
Garret Wassermann
46b7f78968
Update web dependencies: jquery, fontawesome, bootstrap
2020-10-14 23:41:43 -04:00
alligatorbait
eca0f16806
bug fix data may be referenced when not set
2020-10-14 16:58:37 -06:00
alligatorbait
628b734451
bug fix ak.baseurl set before ak initialized
2020-10-14 16:46:41 -06:00
Tom Weber
b33ee08d5d
customizable navigation header template available for override
2020-10-13 20:12:09 -06:00
Tom Weber
14b53bb498
Updated references to functions being tested and corrected test named test_get_email_quiet_option
2020-10-13 18:30:01 -06: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
Thomas Weber
d3cb9fdf23
Corrected date_created field to current created field as it exists in models.py
2020-10-13 11:20:58 -06:00
Thomas Weber
39d810778a
filter import updated to Django recommended syntax, changed to decorator, and only filter user field if authenticated
2020-10-13 11:20:09 -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
937a048a9b
Updated load static in templates to current syntax
2020-10-12 16:30:25 -06:00
alligatorbait
f9f975932b
available_attrs was removed from Django as it was only used as a Python 2 bug workaround
2020-10-12 16:11:07 -06: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
Garret Wassermann
5d70fc167d
Merge pull request #882 from TurnrDev/hotfix/migrations
...
Missing Migrations for 0.2.22 for boolean fields
2020-10-11 13:22:35 -04:00
Jay Turner
306446b389
Fixes a missing migrations messages in 0.2.22 which is caused by the careless changing of strings in models
2020-10-10 13:28:27 +01:00
Benbb96
37713db32a
Show username of ticket's owner in ticket_list if user has no full name nor email
2020-10-08 22:47:52 +02:00
Benbb96
5b44a3aca6
Fix an error when creating a ticket with a submitter email that is shared by multiple users
2020-10-08 22:34:45 +02: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
Garret Wassermann
0774692742
Merge pull request #862 from typonaut/patch-4
...
Update kb_category.html, Standardises output between KB listing and KB items rating display (so that both are "n/10", where the listing was previously a float), and captures case where there may be no votes cast.
2020-08-19 13:11:32 -04:00
typonaut
ff171e3c38
Update kb_item.html
...
Standardises output between KB listing and KB item, captures problem where there may be no votes cast.
2020-08-19 18:07:46 +01:00
typonaut
67bd484a35
Update kb_category.html
...
Standardises output between KB listing and KB items rating display (so that both are "n/10", where the listing was previously a float), and captures case where there may be no votes cast.
2020-08-19 18:02:20 +01:00
chris hellberg
c66d523f66
Added endblock statement to ticket_list.html
2020-08-18 11:55:45 -04:00
chris hellberg
e6847e916e
added cancel changes button to edit ticket page
2020-08-16 14:49:30 -04:00
Garret Wassermann
41b9f38ab6
Merge pull request #854 from typonaut/patch-2
...
Update kb_category.html - space after colon in H2 heading.
2020-08-15 13:28:06 -04:00
typonaut
604306d738
Update kb_item.html
...
Fixed a minor typo: space after colon in H2 heading
2020-08-15 16:30:58 +01:00
