Skip to content

Added searchSettings to TwoDeepEntityPage and ResponsesController #1021

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

Merged
Isti01 merged 2 commits into from
Mar 28, 2026
Merged

Added searchSettings to TwoDeepEntityPage and ResponsesController #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b68914
added searchSettings to TwoDeepEntityPage and ResponsesController
SzBeni2003 Mar 26, 2026
af3b03c
added searchSettings to TwoDeepEntityPage and ResponsesController
SzBeni2003 Mar 26, 2026
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
4 changes: 3 additions & 1 deletion backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/ResponsesController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import tools.jackson.databind.ObjectMapper
import tools.jackson.dataformat.csv.CsvMapper
import hu.bme.sch.cmsch.controller.admin.ControlAction
import hu.bme.sch.cmsch.controller.admin.TwoDeepEntityPage
import hu.bme.sch.cmsch.controller.admin.calculateSearchSettings
import hu.bme.sch.cmsch.extending.FormSubmissionListener
import hu.bme.sch.cmsch.repository.ManualRepository
import hu.bme.sch.cmsch.service.*
Expand Down Expand Up @@ -111,7 +112,8 @@ class ResponsesController(
true,
"Exportálás CSV fájlba"
)
)
),
innerSearchSettings = calculateSearchSettings<ResponseEntity>(false),
) {

private val exportPermission = StaffPermissions.PERMISSION_EDIT_FORM_RESULTS
Expand Down
6 changes: 4 additions & 2 deletions backend/src/main/kotlin/hu/bme/sch/cmsch/controller/admin/TwoDeepEntityPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ abstract class TwoDeepEntityPage<OUTER : IdentifiableEntity, INNER: Identifiable

private val outerControlActions: MutableList<ControlAction> = mutableListOf(),
innerControlActions: MutableList<ControlAction> = mutableListOf(),
buttonActions: MutableList<ButtonAction> = mutableListOf()
buttonActions: MutableList<ButtonAction> = mutableListOf(),
private val innerSearchSettings: SearchSettings? = null,
): OneDeepEntityPage<INNER>(
view,
innerClassType,
Expand Down Expand Up @@ -101,7 +102,7 @@ abstract class TwoDeepEntityPage<OUTER : IdentifiableEntity, INNER: Identifiable
ignoreFromMenu,

innerControlActions,
buttonActions
buttonActions,
) {

private val outerDescriptor = OverviewBuilder(outerClassType)
Expand Down Expand Up @@ -182,6 +183,7 @@ abstract class TwoDeepEntityPage<OUTER : IdentifiableEntity, INNER: Identifiable
model.addAttribute("controlActions", controlActions.filter { it.permission.validate(user) })
model.addAttribute("allControlActions", controlActions)
model.addAttribute("buttonActions", buttonActions.filter { it.permission.validate(user) })
model.addAttribute("searchSettings", innerSearchSettings)

attachPermissionInfo(model)

Expand Down
Loading