Skip to content

Remove object-level discussions #937

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
labkey-adam merged 2 commits into from
Oct 7, 2025
Merged

Remove object-level discussions #937

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
f0eff3e
Remove object-level discussions
labkey-adam Oct 2, 2025
30fcec3
Merge remote-tracking branch 'origin/develop' into fb_86_discussions
labkey-adam Oct 4, 2025
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
19 changes: 2 additions & 17 deletions flow/src/org/labkey/flow/controllers/compensation/showCompensation.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* limitations under the License.
*/
%>
<%@ page import="org.labkey.api.announcements.DiscussionService" %>
<%@ page import="org.labkey.api.security.permissions.UpdatePermission" %>
<%@ page import="org.labkey.api.util.HtmlString" %>
<%@ page import="org.labkey.api.view.ActionURL" %>
Expand All @@ -25,10 +24,10 @@
<%@ page import="org.labkey.flow.controllers.FlowParam" %>
<%@ page import="org.labkey.flow.controllers.well.WellController" %>
<%@ page import="org.labkey.flow.data.FlowCompensationMatrix" %>
<%@ page import="org.labkey.flow.data.FlowDataType"%>
<%@ page import="org.labkey.flow.data.FlowDataType" %>
<%@ page import="org.labkey.flow.data.FlowRun"%>
<%@ page import="org.labkey.flow.data.FlowWell"%>
<%@ page import="org.labkey.flow.view.SetCommentView" %>
<%@ page import="org.labkey.flow.view.SetCommentView"%>
<%@ page import="org.labkey.flow.view.SetGraphSizeView" %>
<%@ page import="java.text.DecimalFormat" %>
<%@ page import="java.util.HashMap" %>
Expand Down Expand Up @@ -192,17 +191,3 @@
</table>
<% } %>
<%=link("Download", flowComp.urlDownload()).nofollow()%><br>
<%
DiscussionService service = DiscussionService.get();
if (service != null)
{
DiscussionService.DiscussionView discussion = service.getDiscussionArea(
getViewContext(),
flowComp.getLSID(),
flowComp.urlShow(),
"Discussion of " + flowComp.getLabel(),
false, true);
if (discussion != null)
include(discussion, out);
}
%>
17 changes: 0 additions & 17 deletions flow/src/org/labkey/flow/controllers/executescript/showScript.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
%>
<%@ page import="org.labkey.api.action.NullSafeBindException" %>
<%@ page import="org.labkey.api.announcements.DiscussionService" %>
<%@ page import="org.labkey.api.data.CompareType" %>
<%@ page import="org.labkey.api.data.Table" %>
<%@ page import="org.labkey.api.query.FieldKey" %>
Expand Down Expand Up @@ -92,19 +91,3 @@ The analysis section describes which gates in the analysis, as well as the stati
}
} %>
</div>

<%
DiscussionService service = DiscussionService.get();
if (service != null)
{
DiscussionService.DiscussionView discussion = service.getDiscussionArea(
context,
script.getLSID(),
script.urlShow(),
"Discussion of " + script.getLabel(),
false, true);
if (discussion != null)
include(discussion, out);
}
%>

20 changes: 2 additions & 18 deletions flow/src/org/labkey/flow/controllers/run/showRun.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
*/
%>
<%@ page buffer="none" %>
<%@ page import="org.labkey.api.announcements.DiscussionService" %>
<%@ page import="org.labkey.api.attachments.Attachment"%>
<%@ page import="org.labkey.api.attachments.Attachment" %>
<%@ page import="org.labkey.api.data.Container"%>
<%@ page import="org.labkey.api.data.ContainerManager"%>
<%@ page import="org.labkey.api.exp.api.ExperimentUrls" %>
<%@ page import="org.labkey.api.exp.api.ExperimentUrls"%>
<%@ page import="org.labkey.api.portal.ProjectUrls" %>
<%@ page import="org.labkey.api.security.User" %>
<%@ page import="org.labkey.api.security.permissions.UpdatePermission" %>
Expand All @@ -38,7 +37,6 @@
<%@ page import="org.labkey.flow.data.FlowRun" %>
<%@ page import="org.labkey.flow.view.FlowQueryView" %>
<%@ page import="org.labkey.flow.view.SetCommentView" %>
<%@ page import="java.util.Map" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
<%!
Expand Down Expand Up @@ -115,25 +113,11 @@
%><%=link("Download Analysis zip", run.urlFor(RunController.ExportAnalysis.class).addParameter("selectionType", "runs")).nofollow()%><br><%
}


for (Attachment a : run.getAttachments())
{
%><div>
<a href="<%=h(run.getAttachmentDownloadURL(a))%>"><i class="<%=h(Attachment.getFileIconFontCls(a.getName()))%>"></i> <%=h(a.getName())%></a>
</div><%
}

DiscussionService service = DiscussionService.get();
if (service != null)
{
DiscussionService.DiscussionView discussion = service.getDiscussionArea(
getViewContext(),
run.getLSID(),
run.urlShow(),
"Discussion of " + run.getLabel(),
false, true);
if (discussion != null)
include(discussion, out);
}
%>
</p>
22 changes: 3 additions & 19 deletions flow/src/org/labkey/flow/controllers/well/showWell.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* limitations under the License.
*/
%>
<%@ page import="org.labkey.api.announcements.DiscussionService" %>
<%@ page import="org.labkey.api.exp.OntologyManager" %>
<%@ page import="org.labkey.api.exp.api.ExpMaterial" %>
<%@ page import="org.labkey.api.exp.api.ExperimentUrls" %>
Expand All @@ -26,7 +25,8 @@
<%@ page import="org.labkey.api.security.User" %>
<%@ page import="org.labkey.api.security.permissions.ReadPermission" %>
<%@ page import="org.labkey.api.security.permissions.UpdatePermission" %>
<%@ page import="org.labkey.api.util.DateUtil"%>
<%@ page import="org.labkey.api.util.DateUtil" %>
<%@ page import="org.labkey.api.util.JavaScriptFragment"%>
<%@ page import="org.labkey.api.util.PageFlowUtil" %>
<%@ page import="org.labkey.api.util.Tuple3" %>
<%@ page import="org.labkey.api.util.URIUtil" %>
Expand Down Expand Up @@ -58,7 +58,6 @@
<%@ page import="java.util.Map" %>
<%@ page import="java.util.regex.Matcher" %>
<%@ page import="java.util.regex.Pattern" %>
<%@ page import="org.labkey.api.util.JavaScriptFragment" %>
<%@ page extends="org.labkey.flow.controllers.well.WellController.Page" %>
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
<%!
Expand Down Expand Up @@ -592,22 +591,7 @@ if (getRun() != null)
%><%=link("Experiment Run Graph Details", urlProvider(ExperimentUrls.class).getRunGraphDetailURL(getRun().getExperimentRun(), well.getData()))%><br><%
}

%></p><%

DiscussionService service = DiscussionService.get();
if (service != null)
{
DiscussionService.DiscussionView discussion = service.getDiscussionArea(
getViewContext(),
well.getLSID(),
well.urlShow(),
"Discussion of " + well.getLabel(),
false, true);
if (discussion != null)
include(discussion, out);
}
%>

%></p>

<%!
boolean canReadPipelineFiles(User user, PipeRoot root)
Expand Down