Commit Graph

121 Commits

Author SHA1 Message Date
DL6ER
10ca38da47 Use new special POST :batchDelete callbacks for /api/groups, /api/domains/, /api/clients, and /api/lists and remove some code duplication along the way. Also ensure that the "Default" group cannot be selected for deletion (we already suppress the trash button for this entry)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-07 19:00:59 +01:00
DL6ER
70a009d24d Remove extra <ul></ul>
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-24 07:50:45 +01:00
DL6ER
fe8296acb8 Merge branch 'development-v6' into tweak/contentType
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-20 19:51:49 +01:00
DL6ER
a518b60afe Show Unicode domains (if different from possibly punycode-encoded raw domains)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-19 23:02:12 +01:00
DL6ER
a39c8a5c0a Escape only where we are displaying
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-18 22:38:01 +01:00
DL6ER
bc1c6bc117 Explicitly set contentType to avoid promotion to jsonp
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-18 12:54:41 +01:00
DL6ER
7c0812b52b Apply necessary code styling changes
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-17 10:36:38 +01:00
DL6ER
9815602ecd Call initTable() from getGroups() when finished to avoid a possible race-collision
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-17 10:33:38 +01:00
DL6ER
8b7c88f1bf Do not accept comma to separate regex (#2835) 2023-11-16 22:26:42 +01:00
DL6ER
0371f870a8 Domains/Regex must be either space or newline separated when adding multiple at once. It is not possible to use comma as this has a special meaning in the regex world
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-15 12:11:57 +01:00
RD WebDesign
eeb07535ad Clear input fields after successfully adding new items
Applies to Clients, Domains and Lists.
2023-11-14 19:58:41 -03:00
DL6ER
ca67f3a11e Add a few more comments, fix applyBtn variable declaration, make selection only work on the first <td>-element and ensure we include both type and kind in the data-id attribute to make it really a unique selector
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-12 08:25:46 +01:00
DL6ER
9049674eb4 A domain is a domain and not a list
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-10 20:53:05 +01:00
DL6ER
4d3c0cded9 Fix errors happening when editing groups/clients/domains/lists not being shown. Also fix logic of the strings "enabling/disabling" as the variable "enabled" already has the new (not the current state). This was correct in groups.js, but not the others
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-05 21:54:40 +01:00
DL6ER
402017798e Merge branch 'development-v6' into tweak/domain_array
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-14 16:23:31 +02:00
DL6ER
43c8ede674 Add "processData: false" to all JSON data we send
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-13 09:44:01 +02:00
DL6ER
1146248964 Revert "Fix AJAX JSON data (#2742)"
This reverts commit 340d373711, reversing
changes made to 1ed1efdc91.

Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-13 09:41:10 +02:00
DL6ER
d2701f7955 We should not use JSON.stringify() but leave escaping to AJAX itself
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-10 19:28:14 +02:00
DL6ER
d516aec5ce Give details about sucessfully added and failed items to domains, groups, lists and clients
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-08 10:56:45 +02:00
DL6ER
a6ba2a8eb8 Implement support for adding multiple domains, clients, groups, and list addresses at once
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-07 21:38:10 +02:00
DL6ER
4d3d64b904 Ported groups-domains.lp and groups-adlists.lp
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-06 20:07:26 +02:00
Christian König
4473955291 Don't use idstring in messages when it's not necessary
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-20 16:57:34 +01:00
Christian König
acac90f79d Tweak deleting message
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-20 16:57:34 +01:00
Christian König
d55847013f Fix deprecated warnings of jquery-migrate
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-13 17:53:13 +02:00
RD WebDesign
4d8b19f4c9 Address team decisions
- change checkboxes order;
- remove all lines if all checkboxes are unselected.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-09-09 14:26:54 -03:00
RD WebDesign
3ef30992c5 Move filter selector to header-box
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-09-09 14:26:54 -03:00
RD WebDesign
3235056d31 Add the ability to filter domains by type
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-09-09 14:26:54 -03:00
Joshua Wu
a0417e92d1 Refocus the domain element after submitting new domain in list form
Signed-off-by: Joshua Wu <Joshua.wu.0910@gmail.com>
2022-08-24 16:50:21 -07:00
DL6ER
82d18b51a3 Further simplification of the code, removing empty code blocks and some always-true if-clauses
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-17 10:45:17 +02:00
Christian König
6a1e590a07 Remove black/whitelist from group pages
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-16 14:20:43 +02:00
Christian König
4c66e22260 Fix editing domains from blacklist/whitelist pages
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-11 10:19:53 +02:00
Anthony de Jong
eaef6f8733 Show suggested domains in group domains page
Signed-off-by: Anthony de Jong <11158888+anthony-de-jong@users.noreply.github.com>
2022-06-02 08:04:27 +00:00
RD WebDesign
f0bd5d725e Fixing minor inconsistencies
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-05-07 15:37:39 -03:00
RD WebDesign
a2cb6821dc Fixing weird bug
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-05-07 00:30:07 -03:00
RD WebDesign
9a019a64ee Applying the reviewer's suggestions
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-04-30 14:34:22 -03:00
RD WebDesign
f8ab31f431 Allow delete multiple items - Group pages
- add checkboxes, buttons and functions to groups page;
- add checkboxes, buttons and functions to clients page;
- add checkboxes, buttons and functions to domains page;
- add checkboxes, buttons and functions to adlists page;
- move function to `utils.js`;
- fix CSS after insert a new table column;

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-04-22 22:22:03 -03:00
Christian König
01de8fa3a8 Add navigation above all datatables
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-02-06 21:47:44 +01:00
RD WebDesign
035d8f981d Fix layout on small screens (Group Mgmt tables) (#2078)
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
2022-01-14 22:41:41 +01:00
Christian König
78aace3403 Revert "Remove duplicated code as it is already part of utils.stateLoadCallback"
This reverts commit 395b1b6c1f.

Signed-off-by: Christian König <ckoenig@posteo.de>
2021-11-14 22:38:18 +01:00
yubiuser
5aeb52ee50 Merge pull request #1948 from pi-hole/tweak/datatables
Tweak to datatables column rendering
2021-10-28 20:21:01 +02:00
yubiuser
98ec9ee2fc Set stateDuration to 0 for all saved datatables to store the state indefinitely (#1944)
* Set stateDuration to 0 for all saved datatables to store the state indefinite

Signed-off-by: Christian König <ckoenig@posteo.de>

* Move stateDuration to utils.js

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove duplicated code as it is already part of utils.stateLoadCallback

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fix function

Signed-off-by: Christian König <ckoenig@posteo.de>

* Revert "Fix function"

This reverts commit 2f54f5f988.

Signed-off-by: Christian König <ckoenig@posteo.de>

* Revert "Move stateDuration to utils.js"

This reverts commit 6a3e7786bc.

Signed-off-by: Christian König <ckoenig@posteo.de>
2021-10-27 20:06:02 +01:00
Adam Warner
0e483a8eea Force all columns in any declared datatable to render using datatables render.text function to prevent possible (very low risk, requiring authenticated dashboard anyway) XSS.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-10-27 19:49:46 +01:00
DL6ER
0d0a8dba67 Change prettier option trailingComma from "none" to the new default "es5" (see https://prettier.io/docs/en/options.html#trailing-commas)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-06-23 11:26:43 +02:00
Adam Warner
638a7db036 Merge pull request #1603 from thislooksfun/devel
Fix html escaping showing up in input fields. (#1584)
2020-11-08 15:40:04 +00:00
Adam Warner
280d31c00f Merge branch 'devel' into fix/group_sel_simple_pages 2020-11-08 13:57:52 +00:00
thislooksfun
8f55dfa03b Fix html escaping showing up in input fields. (#1584)
Signed-off-by: thislooksfun <thislooksfun@repbot.org>
2020-10-12 12:26:49 -05:00
XhmikosR
ea1fd6c323 Remove HTML from titles when not needed.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-22 08:53:48 +03:00
Adam Warner
c949516ee1 make use of utils.escapeHtml on the JS side of things, and html_entity_decode/htmlentities in PHP
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-13 18:50:36 +01:00
Adam Warner
7aa79a7a77 Merge pull request #1420 from pi-hole/tweak/improve_warnings
Improve messages on the domain management pages
2020-06-05 19:17:17 +01:00
DL6ER
4bf018b52c Add missing radix information in parseInt().
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 16:57:55 +02:00