Skip to content

53361: 'list-details.view' doesn't work when list pk is named "name" #6854

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-klum merged 3 commits into from
Jul 22, 2025
Merged

53361: 'list-details.view' doesn't work when list pk is named "name" #6854

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0ff816
Don't rely on tableViewForm to resolve the list item PK
labkey-klum Jul 11, 2025
abc3605
Merge branch 'develop' into fb_issue_53361
labkey-klum Jul 16, 2025
ba4a582
Merge branch 'develop' into fb_issue_53361
labkey-klum Jul 22, 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
43 changes: 33 additions & 10 deletions list/src/org/labkey/list/controllers/ListController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.labkey.list.controllers;

import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -130,8 +132,6 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;

import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
Expand Down Expand Up @@ -551,22 +551,36 @@ protected Collection<Pair<String, String>> getInputs(ListDefinition list, Action
}
}

public static class ListDetailsForm extends ListDefinitionForm
{
private Object _pk;

public Object getPk()
{
return _pk;
}

public void setPk(Object pk)
{
_pk = pk;
}
}

@RequiresPermission(ReadPermission.class)
public class DetailsAction extends SimpleViewAction<ListDefinitionForm>
public class DetailsAction extends SimpleViewAction<ListDetailsForm>
{
private ListDefinition _list;

@Override
public ModelAndView getView(ListDefinitionForm form, BindException errors)
public ModelAndView getView(ListDetailsForm form, BindException errors)
{
_list = form.getList();
TableInfo table = _list.getTable(getUser(), getContainer());

if (null == table)
throw new NotFoundException("List does not exist");

ListQueryUpdateForm tableForm = new ListQueryUpdateForm(table, getViewContext(), _list, errors);
ListQueryUpdateForm tableForm = new ListQueryUpdateForm(table, getViewContext(), _list, form.getPk(), errors);
DetailsView details = new DetailsView(tableForm);

ButtonBar bb = new ButtonBar();
Expand Down Expand Up @@ -668,20 +682,29 @@ public void addNavTrail(NavTree root)
public static class ListQueryUpdateForm extends QueryUpdateForm
{
private final ListDefinition _list;
private final Object _pk;

public ListQueryUpdateForm(TableInfo table, ViewContext ctx, ListDefinition list, BindException errors)
public ListQueryUpdateForm(TableInfo table, ViewContext ctx, ListDefinition list, @Nullable Object pk, BindException errors)
{
super(table, ctx, errors);
_list = list;
_pk = pk;
}

@Override
public Object[] getPkVals()
{
Object[] pks = super.getPkVals();
assert 1 == pks.length;
pks[0] = _list.getKeyType().convertKey(pks[0]);
return pks;
if (_pk != null)
{
return new Object[]{_pk};
}
else
{
Object[] pks = super.getPkVals();
assert 1 == pks.length;
pks[0] = _list.getKeyType().convertKey(pks[0]);
return pks;
}
}

public Domain getDomain()
Expand Down