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

Jump to bottom

Issue43657: Option for setting file root wording #2586

Merged
merged 4 commits into from Sep 1, 2021
Merged

Issue43657: Option for setting file root wording #2586

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a7f8b6
Change wording
RosalineP Aug 19, 2021
bb373cf
Merge branch 'develop' into fb_Issue43657
RosalineP Aug 31, 2021
a9967a9
Latest iteration from docs
RosalineP Aug 31, 2021
2b1085a
update with consensus wording
RosalineP Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/org/labkey/core/admin/view/filesProjectSettings.jsp
View file
Open in desktop
Expand Up @@ -118,7 +118,7 @@
type="radio" name="fileRootOption" id="optionSiteDefault" value="<%=FileRootProp.siteDefault%>"
<%=checked(FileRootProp.siteDefault.name().equals(bean.getFileRootOption()))%>
onclick="updateSelection(<%=h(!FileRootProp.siteDefault.name().equals(bean.getFileRootOption()))%>);">
Use a default based on the project-level root
Use a default based on the <%=h(getContainer().isProject() ? "site-level file root" : "file root of the parent container")%>:
RosalineP marked this conversation as resolved.
Show resolved Hide resolved
<input type="text" id="rootPath" size="64" disabled="true" value="<%=h(defaultRoot)%>"></td>
</tr>
<tr style="height: 1.75em">
Expand Down