mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-08-16 22:20:30 +03:00
Pull request: pre-filling the new static lease window with data
Updates #6402 Squashed commit of the following: commit 17c1c65b4e0bda827466cd882f8debbec92e0f9f Merge: 056f5ce4cb1b5c41cf
Author: Ildar Kamalov <ik@adguard.com> Date: Tue Nov 14 14:20:34 2023 +0300 Merge branch 'master' into ADG-7719 commit 056f5ce4cd00d82b1883cd6c7d5e331f34ac167f Merge: 99bc4af7d37b69b218
Author: Ildar Kamalov <ik@adguard.com> Date: Tue Nov 14 10:28:39 2023 +0300 Merge branch 'master' into ADG-7719 commit 99bc4af7d80d6f4dd04ad103352882a1629cd44c Author: Ildar Kamalov <ik@adguard.com> Date: Mon Nov 13 19:16:19 2023 +0300 fix lint commit 3aa6525203f7c882484689fd7b61347124812154 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Nov 13 19:15:43 2023 +0300 fix payload check commit 9f5fbf9643e69e9b7e2c3bbfad8377f79e02027b Author: Ildar Kamalov <ik@adguard.com> Date: Mon Nov 13 19:14:14 2023 +0300 fix changelog commit 5b002d0dac064d2ab7144d268142335c9e006767 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Nov 13 19:12:43 2023 +0300 ADG-7719 filling the new static lease window with data
This commit is contained in:
parent
b1b5c41cfe
commit
f44faa9be3
@ -25,9 +25,11 @@ NOTE: Add new changes BELOW THIS COMMENT.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Pre-filling the New static lease window with data ([#6402]).
|
||||
- Protection pause timer synchronization ([#5759]).
|
||||
|
||||
[#5759]: https://github.com/AdguardTeam/AdGuardHome/issues/5759
|
||||
[#6402]: https://github.com/AdguardTeam/AdGuardHome/issues/6402
|
||||
|
||||
<!--
|
||||
NOTE: Add new changes ABOVE THIS COMMENT.
|
||||
|
@ -27,7 +27,7 @@ class Leases extends Component {
|
||||
<div className="logs__row logs__row--center">
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-icon btn-icon--green btn-outline-secondary btn-sm"
|
||||
className="btn btn-icon btn-icon--green btn-outline-success btn-sm"
|
||||
title={t('make_static')}
|
||||
onClick={this.convertToStatic(row)}
|
||||
disabled={disabledLeasesButton}
|
||||
|
@ -128,8 +128,7 @@ const dhcp = handleActions(
|
||||
const newState = {
|
||||
...state,
|
||||
isModalOpen: !state.isModalOpen,
|
||||
modalType: payload?.type || '',
|
||||
leaseModalConfig: payload?.config,
|
||||
leaseModalConfig: payload,
|
||||
};
|
||||
return newState;
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user