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

Add param handler to toggle bundles on/off based on client #995

Merged
merged 3 commits into from
Aug 23, 2023
Merged

Add param handler to toggle bundles on/off based on client #995

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24763c2
Fix null handling, optString() returns empty string by default for mi…
ZakarFin Aug 22, 2023
58fcd0d
Remove unnecessary code
ZakarFin Aug 22, 2023
2c6a6b3
Add param handler for 'mobile=true'
ZakarFin Aug 22, 2023
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
Prev Previous commit
Next Next commit
Remove unnecessary code
  • Loading branch information
@ZakarFin
ZakarFin committed Aug 22, 2023
commit 58fcd0d3211484e7d21d493780f5e1b4f5bebdf1
4 changes: 2 additions & 2 deletions control-base/src/main/java/fi/nls/oskari/control/view/GetAppSetupHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ public void init() {
final String[] dynamicBundles = PropertyUtil.getCommaSeparatedList("actionhandler.GetAppSetup.dynamic.bundles");

// Get roles for each dynamic bundle and retrieve bundles from db. Store bundles in <role,bundle> map.
Map <String, Bundle> requestedBundles = new HashMap<String, Bundle>();
Map <String, Bundle> requestedBundles = new HashMap<>();
for(String bundleId : dynamicBundles) {
final String[] rolesForBundle = PropertyUtil.getCommaSeparatedList("actionhandler.GetAppSetup.dynamic.bundle."
+ bundleId + ".roles");

for(String roleName : rolesForBundle) {
if(!bundlesForRole.containsKey(roleName)) {
bundlesForRole.put(roleName, new ArrayList<Bundle>());
bundlesForRole.put(roleName, new ArrayList<>());
}

List<Bundle> list = bundlesForRole.get(roleName);
Expand Down