Skip to content

Commit dcc8e32

Browse files
authored
Better handling for missing assay request module. (#7566)
#### Rationale LabKey/internal-issues#885 Small fix for a somewhat corner case.
1 parent 4473d67 commit dcc8e32

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

issues/src/org/labkey/issue/model/IssueListDef.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.labkey.api.security.User;
4545
import org.labkey.api.util.GUID;
4646
import org.labkey.api.util.UnexpectedException;
47+
import org.labkey.api.view.NotFoundException;
4748
import org.labkey.issue.query.IssueDefDomainKind;
4849

4950
import java.util.Collection;
@@ -159,6 +160,8 @@ public AbstractIssuesListDefDomainKind getDomainKind()
159160
private static String generateDomainURI(Container c, User user, String name, String kindName)
160161
{
161162
DomainKind<?> domainKind = PropertyService.get().getDomainKindByName(kindName);
163+
if (domainKind == null)
164+
throw new NotFoundException("Domain kind not found: " + kindName);
162165
return domainKind.generateDomainURI(IssuesSchema.getInstance().getSchemaName(), name, c, user);
163166
}
164167

issues/src/org/labkey/issue/query/IssuesListDefTable.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,21 +182,28 @@ public void addQueryFieldKeys(Set<FieldKey> keys)
182182
@Override
183183
public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
184184
{
185-
Container c = getContainer(ctx);
186-
if (c != null)
185+
try
187186
{
188-
if (c.hasPermission(getUserSchema().getUser(), ReadPermission.class))
187+
Container c = getContainer(ctx);
188+
if (c != null)
189189
{
190-
out.write(LinkBuilder.simpleLink(c.getName(), c.getStartURL(getUserSchema().getUser())));
190+
if (c.hasPermission(getUserSchema().getUser(), ReadPermission.class))
191+
{
192+
out.write(LinkBuilder.simpleLink(c.getName(), c.getStartURL(getUserSchema().getUser())));
193+
}
194+
else
195+
{
196+
out.write(c.getName());
197+
}
191198
}
192199
else
193200
{
194-
out.write(c.getName());
201+
super.renderGridCellContents(ctx, out);
195202
}
196203
}
197-
else
204+
catch (Exception e)
198205
{
199-
super.renderGridCellContents(ctx, out);
206+
out.write(e.getMessage());
200207
}
201208
}
202209
};

0 commit comments

Comments
 (0)