Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix admin navbar consistent options #1018

Merged
merged 9 commits into from
Apr 29, 2024
Merged

Fix admin navbar consistent options #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6bc2bbf
Merge branch 'release/1.71.2'
gedge Jan 10, 2024
30706e6
Merge remote-tracking branch 'origin/master' into rel/1.73.0
jondewijones Jan 18, 2024
9468f45
Merge branch 'master' into release/1.74.0
jondewijones Mar 4, 2024
57d0c65
Merge branch 'master' into release/1.73.1
JoshSinghONS Apr 18, 2024
54e61c1
Merge branch 'develop' into release/1.73.1
JoshSinghONS Apr 19, 2024
4889914
add 'security' to old navbar for admins
jondewijones Apr 29, 2024
14f06ac
add handling 'security' nav item
jondewijones Apr 29, 2024
d2f3af8
don't think this require is needed and is causing runtime errors
jondewijones Apr 29, 2024
ecae20a
Merge branch 'master' into fix/admin-navbar-consistent-options
jondewijones Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/legacy/js/functions/_setupFlorence.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ function setupFlorence() {
} else if (menuItem.hasClass("js-nav-item--reports")) {
window.history.pushState({}, "", "/florence/reports");
viewController('reports');
} else if (menuItem.hasClass("js-nav-item--security")) {
window.history.pushState({}, "", "/florence/security");
viewController('security');
} else if (menuItem.hasClass("js-nav-item--login")) {
viewController('login');
} else if (menuItem.hasClass("js-nav-item--logout")) {
Expand Down
3 changes: 3 additions & 0 deletions src/legacy/js/functions/_viewController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ function viewController(view) {
else if (view === 'reports') {
viewReports();
}
else if (view === 'security') {
window.location.pathname = "/florence/security";
}
else {
// viewController('collections');
window.location.pathname = "/florence";
Expand Down
2 changes: 0 additions & 2 deletions src/legacy/js/functions/_viewPublishDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const { load } = require("js-yaml");

function viewPublishDetails(collections) {
var manual = "[manual collection]";
var result = {
Expand Down
Loading