Skip to content

Iqss/8757 file restriction with public install #8758

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
kcondon merged 8 commits into from
Jun 23, 2022
Merged

Iqss/8757 file restriction with public install #8758

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fb24c87
Merge pull request #8302 from IQSS/develop
kcondon Dec 9, 2021
353fb04
Merge branch 'IQSS:develop' into develop
haarli Dec 14, 2021
a57ce53
Merge pull request #8511 from IQSS/develop
kcondon Mar 18, 2022
89ed796
Merge tag 'v5.10' into develop
haarli Mar 24, 2022
0e4718f
Merge branch 'IQSS:develop' into develop
haarli Mar 24, 2022
320274e
#IQSS/8757 deactivate file restriction for PublicInstall
haarli Jun 1, 2022
59b7289
Merge branch 'IQSS:develop' into IQSS/8757_file_restriction_with_publ…
haarli Jun 2, 2022
dcc4128
Merge branch 'IQSS:develop' into IQSS/8757_file_restriction_with_publ…
haarli Jun 23, 2022
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: 2 additions & 2 deletions src/main/webapp/editFilesFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
<f:setPropertyActionListener target="#{DatasetPage.selectedFiles}" value="#{EditDatafilesPage.selectedFiles}" />
</p:commandLink>
</li>
<li>
<li jsf:rendered="#{!settingsWrapper.publicInstall}">
<p:commandLink onclick="if (!testFilesSelected2()) return false;"
update="@([id$=accessPopup])"
oncomplete="PF('accessPopup').show();">
Expand All @@ -452,7 +452,7 @@
<f:setPropertyActionListener target="#{DatasetPage.selectedFiles}" value="#{EditDatafilesPage.selectedFiles}" />
</p:commandLink>
</li>
<li>
<li jsf:rendered="#{!settingsWrapper.publicInstall}">
<p:commandLink onclick="if (!testFilesSelected2()) return false;"
actionListener="#{EditDatafilesPage.restrictFiles(false)}"
update="filesTable,:messagePanel"
Expand Down