Project

General

Profile

Todo #5994

Make Advanced Buttons work consistently

Added by Phillip Davis over 3 years ago. Updated over 3 years ago.

Status:
Resolved
Priority:
Normal
Assignee:
Category:
-
Target version:
Start date:
03/14/2016
Due date:
% Done:

100%

Estimated time:

Description

See forum for discussion: https://forum.pfsense.org/index.php?topic=108108.0

Where there is an Advanced section:
a) On page load with default values, show "Display Advanced" button and hide the advanced fields.
b) On page load where the existing values are non-default, show "Hide Advanced" button and show the advanced fields.
c) When "Display Advanced" is clicked, show the advanced fields, change the button text to "Hide Advanced".
d) When "Hide Advanced" is clicked, hide the advanced fields, change the button text to "Display Advanced".

History

#1 Updated by Phillip Davis over 3 years ago

I can look at this tonight (my time) = Tuesday day US time.

#2 Updated by Phillip Davis over 3 years ago

Done so far:
services_dhcp.php - https://github.com/pfsense/pfsense/commit/afe62c2bbb892f053c8264f3c2bffa6a15111990
services_dhcp_edit.php - https://github.com/pfsense/pfsense/commit/7a2c01319093262a09099def402bf00cab3b5c3c
services_dhcpv6.php - https://github.com/pfsense/pfsense/commit/4aa42b06a6cd64e93d7b0a243bcb82d8b741efa2

system_gateways_edit.php - pull request https://github.com/pfsense/pfsense/pull/2742

To be done:
services_ntpd.php
services_ntpd_gps.php
services_unbound.php (Custom Options button)
interfaces_bridge_edit.php
interfaces_ppps_edit.php
firewall_rules_edit.php
firewall_nat_edit.php

Look at pkg_edit.php - it has some support for "Advanced Options" - and see if there is anything useful to be done there.

About 40% complete.

#3 Updated by Phillip Davis over 3 years ago

These have also now been done and committed:
services_ntpd.php - https://github.com/pfsense/pfsense/commit/c0d1ceda2ced97fc9aefff5363b995c2103abd8c
services_ntpd_gps.php - https://github.com/pfsense/pfsense/commit/bd9fe79557a161d6c0e6b37791d7a51f7ddc8ba0
interfaces_bridge_edit.php - https://github.com/pfsense/pfsense/commit/6dfeb992d94653b1bbe079a4089d53148c9a4bc5
interfaces_ppps_edit.php https://github.com/pfsense/pfsense/commit/b29b3831ba2bc281f5711b252fc93d2ebdcb0e07

These have pull requests waiting for review:
firewall_rules_edit.php - https://github.com/pfsense/pfsense/pull/2754
firewall_nat_edit.php - https://github.com/pfsense/pfsense/pull/2758

To be done:
services_unbound.php (Custom Options button)

90% complete

#4 Updated by Phillip Davis over 3 years ago

All now done and committed:
firewall_rules_edit.php - https://github.com/pfsense/pfsense/commit/c3ed121066c5ec2c201bc06a4b5e0db321842d01
firewall_nat_edit.php - https://github.com/pfsense/pfsense/commit/61aa0edbe5c815b5fb43571206cc3761f2497361
services_unbound.php - https://github.com/pfsense/pfsense/commit/2c95f1cd20ecb074a7d30ada37a70e22ead85fbd

100% complete from me. Please review, test and (hopefully) update status to resolved.

#5 Updated by Renato Botelho over 3 years ago

  • Status changed from New to Feedback
  • % Done changed from 0 to 100

Thank you Phil!

#6 Updated by Jim Pingle over 3 years ago

  • Assignee set to Jim Pingle

to me for testing

#7 Updated by Jim Pingle over 3 years ago

  • Status changed from Feedback to Assigned
  • Assignee changed from Jim Pingle to Phillip Davis

They all look OK except for firewall_rules_edit.php -- When creating a brand new rule, which defaults to TCP, it shows "Hide Advanced" but the block is already hidden. Clicking it switches the button to "Display advanced" and then clicking expands as expected. If you don't click anything and instead change it to another protocol with ports like UDP or TCP/UDP, the source ports show.

Doesn't quite sound the same as #6007 but it doesn't surprise me that there are some lingering issues with JS on that page, it's pretty complicated especially with its many possible initial states + changes.

#8 Updated by Phillip Davis over 3 years ago

It needed to fix the test for if a source port from/to fields were default or not, so it considers blank or "any" to both be valid default values.
https://github.com/pfsense/pfsense/pull/2760

#9 Updated by Phillip Davis over 3 years ago

Also since #6003 is fixed so that the periodic reset radio button setting is saved in interfaces_pps_edit.php #6003, I noticed that the Advanced fields did not open on page load for that case.
Test criteria fixed to include that, pull request: https://github.com/pfsense/pfsense/pull/2762

That should be all for issue #5994

#10 Updated by Renato Botelho over 3 years ago

  • Status changed from Assigned to Feedback

Both PRs had been merged. Thanks!

#11 Updated by Jim Pingle over 3 years ago

  • Status changed from Feedback to Resolved

The rules case seems to be better after that, looks like this can be closed out.

Also available in: Atom PDF