Skip to content

canEditSourceModule() consistency #7727

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-matthewb merged 7 commits into from
Jul 2, 2026
Merged

canEditSourceModule() consistency #7727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e501689
canEditSourceModule() consistency
labkey-matthewb Jun 5, 2026
d258bb5
Merge remote-tracking branch 'origin/release26.3-SNAPSHOT' into 26.3_…
labkey-matthewb Jun 11, 2026
286db0b
Merge remote-tracking branch 'origin/release26.3-SNAPSHOT' into 26.3_…
labkey-matthewb Jun 23, 2026
ceb1c8a
Merge origin/release26.3-SNAPSHOT into 26.3_fb_canEditSourceModule
labkey-tchad Jun 29, 2026
5e41bc9
Merge remote-tracking branch 'origin/release26.3-SNAPSHOT' into 26.3_…
labkey-matthewb Jun 30, 2026
570be85
remove AdminBean.modules
labkey-matthewb Jun 30, 2026
ff2e36b
remove AdminBean.modules
labkey-matthewb Jun 30, 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
6 changes: 0 additions & 6 deletions api/src/org/labkey/api/admin/AdminBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.labkey.api.data.ContainerManager;
import org.labkey.api.data.CoreSchema;
import org.labkey.api.data.DbScope;
import org.labkey.api.module.Module;
import org.labkey.api.module.ModuleLoader;
import org.labkey.api.security.UserManager;
import org.labkey.api.settings.AppProps;
Expand All @@ -43,7 +42,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
Expand Down Expand Up @@ -82,7 +80,6 @@ public static class RecentUser
public static final String sessionTimeout = Formats.commaf0.format(ModuleLoader.getServletContext().getSessionTimeout());
public static final String buildTime = ModuleLoader.getInstance().getCoreModule().getBuildTime();
public static final String serverStartupTime = DateUtil.formatDateTime(ContainerManager.getRoot());
public static final List<Module> modules;

public static String asserts = "disabled";

Expand Down Expand Up @@ -116,9 +113,6 @@ public static class RecentUser

//noinspection ConstantConditions,AssertWithSideEffects
assert null != (asserts = "enabled");

modules = new ArrayList<>(ModuleLoader.getInstance().getModules());
modules.sort(Comparator.comparing(Module::getName, String.CASE_INSENSITIVE_ORDER));
}

private static @Nullable String getValue(Field field)
Expand Down
2 changes: 1 addition & 1 deletion core/src/org/labkey/core/admin/AdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9193,7 +9193,7 @@ protected void renderView(Object model, HtmlWriter out)
if (null != module.getZippedPath())
p = module.getZippedPath().toPath();
if (isDevMode && ModuleEditorService.get().canEditSourceModule(module))
if (!module.getExplodedPath().getPath().equals(module.getSourcePath()))
if (!isBlank(module.getSourcePath()) && !module.getExplodedPath().getPath().equals(module.getSourcePath()))
p = Paths.get(module.getSourcePath());
fullPathToModule = p.toString();
shortPathToModule = fullPathToModule;
Expand Down
7 changes: 6 additions & 1 deletion core/src/org/labkey/core/admin/admin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<%@ page import="org.labkey.api.files.FileContentService" %>
<%@ page import="org.labkey.api.module.DefaultModule" %>
<%@ page import="org.labkey.api.module.Module" %>
<%@ page import="org.labkey.api.module.ModuleLoader"%>
<%@ page import="org.labkey.api.moduleeditor.api.ModuleEditorService" %>
<%@ page import="org.labkey.api.settings.AdminConsole" %>
<%@ page import="org.labkey.api.settings.AdminConsole.AdminLink" %>
Expand All @@ -36,7 +37,9 @@
<%@ page import="java.time.Duration" %>
<%@ page import="java.time.LocalDateTime" %>
<%@ page import="java.time.format.DateTimeFormatter" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Comparator" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.util.TreeMap" %>
<%@ page import="org.apache.commons.lang3.Strings" %>
Expand Down Expand Up @@ -152,7 +155,9 @@
<%=link("Module Details", AdminController.ModulesAction.class)%>
<br/><br/>
<table><%
for (Module module : AdminBean.modules)
ArrayList<Module> modules = new ArrayList<>(ModuleLoader.getInstance().getModules());
modules.sort(Comparator.comparing(Module::getName, String.CASE_INSENSITIVE_ORDER));
for (Module module : modules)
{
String guid = makeId("m_");
String toggleScript = "return LABKEY.Utils.toggleLink(document.getElementById(" + q(guid) + "), false);";
Expand Down