Skip to content

Commit

Permalink
Pull request: pre-filling the new static lease window with data
Browse files Browse the repository at this point in the history
Updates #6402

Squashed commit of the following:

commit 17c1c65
Merge: 056f5ce b1b5c41
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 14 14:20:34 2023 +0300

    Merge branch 'master' into ADG-7719

commit 056f5ce
Merge: 99bc4af 37b69b2
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 14 10:28:39 2023 +0300

    Merge branch 'master' into ADG-7719

commit 99bc4af
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 19:16:19 2023 +0300

    fix lint

commit 3aa6525
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 19:15:43 2023 +0300

    fix payload check

commit 9f5fbf9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 19:14:14 2023 +0300

    fix changelog

commit 5b002d0
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
  • Loading branch information
IldarKamalov committed Nov 14, 2023
1 parent b1b5c41 commit f44faa9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Settings/Dhcp/Leases.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 1 addition & 2 deletions client/src/reducers/dhcp.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ const dhcp = handleActions(
const newState = {
...state,
isModalOpen: !state.isModalOpen,
modalType: payload?.type || '',
leaseModalConfig: payload?.config,
leaseModalConfig: payload,
};
return newState;
},
Expand Down

0 comments on commit f44faa9

Please sign in to comment.