Commit Graph

334 Commits

Author SHA1 Message Date
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
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
c0f1370974 Remove merge text accidentally left in, for #889 2020-10-15 14:35:33 -04:00
Tom Weber
b33ee08d5d customizable navigation header template available for override 2020-10-13 20:12:09 -06:00
Garret Wassermann
df4024dbb3
Merge branch 'master' into master 2020-10-13 03:38:36 -04:00
alligatorbait
937a048a9b Updated load static in templates to current syntax 2020-10-12 16:30:25 -06:00
Garret Wassermann
6b335590e6 Merge bugfixes from 0.2.23-devel 2020-10-12 03:19:46 -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
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
typonaut
eef16be1a4
Update kb_category.html
Fixed a minor typo: space after colon in H2 heading.
2020-08-15 16:28:29 +01: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
Garret Wassermann
ee4b32254f
Merge pull request #837 from Benbb96/patch-1
Fix javascript buttons for bulk select all/none/inverse in ticket_list by using prop() instead of attr()
2020-07-07 11:53:13 -04:00
Benbb96
95feded289
Update ticket_list.html
Fix Keyword filter box which didn't show up even if it is in saved query.
2020-07-07 11:04:31 +02:00
bbe
d961b2b692 Fix KnowledgeBase item score 2020-06-29 14:47:37 +02:00
Benbb96
1765eb7004
Update ticket_list.html
Fix javascript buttons for bulk select all/none/inverse
2020-06-19 10:05:29 +02:00
bbe
bec486817c Add "Shared" to translation 2020-06-10 11:35:45 +02:00
bbe
4cdea81ae7 Fix a bug with the field label in the ticket form creation. It was translated twice. 2020-06-09 17:31:31 +02:00
bbe
5775de5c4e Add "here" word in translations 2020-06-09 16:29:18 +02:00
Tom Bernens
7dcbe69090 missing a couple " 2020-06-01 17:52:20 -07:00
Tom Bernens
041f707dba forgot end with 2020-06-01 17:50:42 -07:00
Tom Bernens
5f910a72e0 forgot an add 2020-06-01 17:49:50 -07:00
Tom Bernens
1ea2a9cba9 no message 2020-06-01 17:49:10 -07:00
Tom Bernens
9461705591 I was over thinking that 2020-06-01 17:47:54 -07:00
Tom Bernens
a85223e7a5 only create the control if the page number is in the paginator range 2020-06-01 17:20:11 -07:00
Tom Bernens
c854ff764a add -5? 2020-06-01 17:11:33 -07:00
Tom Bernens
b1914bad14 template language arithmatic 2020-06-01 17:08:30 -07:00
Tom Bernens
df6a8a3778 add first and last page controls 2020-06-01 17:06:44 -07:00
Tom Bernens
d9cb76d491 django template syntax (as instead of =) 2020-06-01 16:50:20 -07:00
Tom Bernens
050a65e6df reduce this to only ever show 11 pages (5 before and 5 after the current + the current)) 2020-06-01 16:49:13 -07:00
Tom Bernens
e1b9906fd0 forgot some '%' cause im a big 'ol dummy 2020-06-01 16:22:16 -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
Jani Kajala
96f631f1c5 "Overview" not using trans in templates dashboard.html, kb_index.html, ticket_list.html 2020-04-21 16:25:26 -05:00
Petr Dlouhý
782dd86680 add doctype to iframes 2020-02-26 10:49:28 +01:00
Petr Dlouhý
64db14148f add KBCategory.public in admin list_display 2020-02-26 10:49:28 +01:00
Petr Dlouhý
e448491bf1 more blocks to the KB_category_base template, HTML validity fixes 2020-02-26 10:23:11 +01:00
Petr Dlouhý
cdddc79998 make Knowledge Base templates more flexibly overidable 2020-02-25 14:36:11 +01:00
Timothy Hobbs
2a3272914c Show kbitem categories in kbitem string representation 2020-02-11 15:20:16 +01:00
Timothy Hobbs
f8c652d506 Better filtering + optional columns in ticket list view 2020-02-03 14:17:19 +01:00