Skip to content

Merge discvr-25.7 to develop #258

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
bbimber merged 8 commits into from
Aug 21, 2025
Merged

Merge discvr-25.7 to develop #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6d8c4b0
Fix merge conflicts
bbimber Jul 31, 2025
a8b1fac
Merge pull request #50 from bimberlabinternal/25.7_fb_merge
bbimber Jul 31, 2025
c85442d
More visible link to notification service admin
bbimber Aug 8, 2025
8c329ce
Consider container when truncating data in AbstractDataDefinedTable
bbimber Aug 19, 2025
214800a
Avoid hard-coding container
bbimber Aug 19, 2025
8de6ead
Merge discvr-25.3 to discvr-25.7
bbimber Aug 20, 2025
3f7d276
Merge pull request #52 from bimberlabinternal/25.7_fb_merge
bbimber Aug 20, 2025
af282f2
Merge discvr-25.7 to develop
bbimber Aug 21, 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
7 changes: 6 additions & 1 deletion LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,14 @@ protected Map<String, Object> updateRow(User user, Container container, Map<Stri
protected int truncateRows(User user, Container container)
{
SimpleFilter filter = new SimpleFilter(FieldKey.fromString(_filterColumn), _filterValue, CompareType.EQUAL);

if (getContainerFieldKey() != null)
{
filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), getContainerFieldKey()));
}

return Table.delete(getDbTable(), filter);
}

}

protected class ValuesManager
Expand Down
14 changes: 14 additions & 0 deletions LDK/src/org/labkey/ldk/LDKModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
import org.labkey.api.security.permissions.ReadPermission;
import org.labkey.api.settings.AdminConsole;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.view.DeveloperMenuNavTrees;
import org.labkey.api.view.NavTree;
import org.labkey.api.view.PopupDeveloperView;
import org.labkey.api.view.WebPartFactory;
import org.labkey.ldk.notification.NotificationServiceImpl;
import org.labkey.ldk.notification.SiteSummaryNotification;
Expand Down Expand Up @@ -84,6 +87,17 @@ protected void init()
protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
{
AdminConsole.addLink(AdminConsole.SettingsLinkType.Management, "notification service admin", DetailsURL.fromString("/ldk/notificationSiteAdmin.view").getActionURL(), AdminOperationsPermission.class);
PopupDeveloperView.registerMenuProvider((c, user, trees) -> {
if (c.isRoot() & user.hasSiteAdminPermission())
{
trees.add(DeveloperMenuNavTrees.Section.tools, new NavTree("Notification Service Admin", DetailsURL.fromString("ldk/notificationSiteAdmin.view", c).getActionURL()));
}
else if (!c.isRoot() & c.hasPermission(user, AdminPermission.class))
{
trees.add(DeveloperMenuNavTrees.Section.tools, new NavTree("Notification Service Admin", DetailsURL.fromString("ldk/notificationAdmin.view", c).getActionURL()));
}
});

AdminConsole.addLink(AdminConsole.SettingsLinkType.Management, "file root usage summary", DetailsURL.fromString("/ldk/folderSizeSummary.view").getActionURL(), ReadPermission.class);

if (isSqlServer())
Expand Down