Commit Graph

401 Commits

Author SHA1 Message Date
Garret Wassermann
cd86edce8b
Merge pull request #937 from alligatorbait/datetime
Formerly RFC 5322 "r" format changed to "DATETIME_FORMAT"
2021-02-03 14:33:06 -05:00
Tom Weber
694b303ebc Formerly RFC 5322 "r" format changed to "DATETIME_FORMAT" 2021-02-03 11:03:45 -07:00
Tom Weber
a3cc363981 base_js.html moved to load before code using the resource. 2021-02-02 16:08:35 -07:00
alligatorbait
e9ba600554 Template hard coded date filters removed, use Django DATE_FORMAT for customization. 2021-02-01 13:05:39 -07:00
bbe
1eef8496bb Remove translation on the template (since it is already done in the form definition) 2021-01-04 19:58:43 +01:00
Timothy Hobbs
2e867cba87 Remove hard dependency on pinax teams 2020-12-02 01:26:53 +01:00
Tom Weber
040a0e8d9d Enable offline content for timeline3 usage 2020-11-14 12:54:10 -07:00
Tom Weber
f1a4b87dbd Enable offline content for timeline usage 2020-11-14 11:13:26 -07:00
bbe
bbdd1844f7 Fix translations 2020-11-05 17:17:11 +01:00
bbe
ba5847b5bd Disable Date Range option in Filter Box if the to_date already provided 2020-11-05 16:47:32 +01:00
bbe
77ab80672f Reformat ticket_list.html 2020-11-05 16:39:30 +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
4c0b9b073b revert blocktrans indenting 2020-10-31 18:41:31 +01: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
391cc000b8 Better display for table heading 2020-10-31 00:59:28 +01:00
bbe
ad55d54f2d Update french translations 2020-10-31 00:15:51 +01:00
bbe
ffc51f5e8e Show line breaks in custom field values (when multi lines) 2020-10-30 19:58:01 +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
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
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
0395f26d6c Don't show vote counts if there are no votes 2020-01-27 17:02:20 +01:00
Timothy Hobbs
cd019d1128 Improvements to iframe workflow 2020-01-20 13:23:32 +01:00
Timothy Hobbs
5da7069dbd Add submitter email to ticket list 2020-01-20 13:23:31 +01:00
Timothy Hobbs
ebd876d0e2 Remove deprecated ticket_list_table.html file 2020-01-20 13:23:31 +01:00
Timothy Hobbs
b20f600db2 KB UX improvements 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
Timothy Hobbs
6579ac0e6f Associate tickets with KB items 2020-01-20 13:23:31 +01:00
Timothy Hobbs
7fe6444f8f Redo KB categories as accordion view 2020-01-20 13:23:17 +01:00
Timothy Hobbs
5f29bb632e Associate queues with KB categories 2020-01-20 13:22:45 +01:00
Timothy Hobbs
133075f045 Fix #698 2020-01-20 13:22:45 +01:00
Timothy Hobbs
aadfe08504 Add iframe supporting view for submitting tickets 2020-01-20 13:07:46 +01:00
Timothy Hobbs
d32d23e4e2 Add OR syntax to search 2020-01-20 13:03:44 +01:00
Timothy Hobbs
b96d725239 Refactor query code into customizable class 2020-01-20 13:03:44 +01:00
Timothy Hobbs
6eee6d196c Add timeline view for ticket queries 2020-01-20 13:03:44 +01:00
Timothy Hobbs
c4a1b9ed66 Move Query Results above Query Selection 2020-01-20 13:03:44 +01:00
Timothy Hobbs
627f2ba21b Add search button next to user emails 2020-01-20 13:03:44 +01:00
Timothy Hobbs
0691bbabcd Refactor and fix datatables code to use cache safely 2019-10-11 15:50:35 +02:00
Timothy Hobbs
03d1c66dd6 Refactor ticket list code 2019-10-11 13:10:35 +02:00
Timothy Hobbs
b862732512 Remove "classic" code path and always use datatables for ticket lists 2019-10-08 17:54:59 +02:00
Jachym Cepicky
e7465ab2fd more redminenish ticket filters 2019-07-06 22:36:59 +02:00
Jachym Cepicky
61d8df932c more redminenish ticket view 2019-07-06 22:36:58 +02:00
Jachym Cepicky
37c6905d46 cleaning time_spent formating 2019-07-06 22:36:58 +02:00
Garret Wassermann
d9ca94145f
Merge pull request #759 from OpenGeoLabs/758_public_ticket_editing
fixes #758 : enables adding comments to public tickets
2019-05-24 11:52:47 -04:00
Garret Wassermann
04f6b3efdd
Merge pull request #761 from OpenGeoLabs/760_attachments
fix for ticket #760 displaying followup attachments again
2019-05-24 11:49:17 -04:00
Jachym Cepicky
e5eea3bb43 display time spent only when user is_staff 2019-05-23 17:31:00 +02:00
Jachym Cepicky
416494c7dc fix for ticket #760 displaying followup attachments again 2019-05-23 17:18:57 +02:00
Jachym Cepicky
2e58798fe1 fixes #758 : enables adding comments to public tickets 2019-05-23 09:55:08 +02:00
Garret Wassermann
e3aa39220f
Merge pull request #751 from OpenGeoLabs/template_fix
add space to heading of kb item
2019-04-01 15:54:41 -04:00
Jachym Cepicky
af7cc184e9 add space to heading of kb item 2019-04-01 21:52:48 +02:00
Jachym Cepicky
ef63a1186b fix markdown bug 2019-03-29 15:17:10 +01:00
Jachym Cepicky
579c9db3fc adding some boostrap tyles 2019-03-10 12:43:41 +01:00
Garret Wassermann
ff74a8c21b Sync with upstream merges 2019-03-09 19:01:51 -05:00