Skip to content

ensure non-null project for domain and property descriptors #6971

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 2 commits into from
Sep 3, 2025
Merged

ensure non-null project for domain and property descriptors #6971

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
a5da33b
ensure non-null project for domain and property descriptors
labkey-klum Aug 28, 2025
2f1dabc
Merge remote-tracking branch 'origin/release25.7-SNAPSHOT' into 25.7_…
labkey-adam Aug 29, 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
2 changes: 1 addition & 1 deletion api/src/org/labkey/api/exp/DomainDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public String getDomainURI()
public Container getProject()
{
var c = getContainer();
return null == c ? null : c.getProject();
return null == c ? null : (c.getProject() != null ? c.getProject() : c);
}

public int getTitlePropertyId()
Expand Down
2 changes: 1 addition & 1 deletion api/src/org/labkey/api/exp/PropertyDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ public void setContainer(Container container)
public Container getProject()
{
var c = getContainer();
return null == c ? null : c.getProject();
return null == c ? null : (c.getProject() != null ? c.getProject() : c);
}

public void setProject(Container proj)
Expand Down
12 changes: 6 additions & 6 deletions query/webapp/dataview/DataViewsPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,9 @@ Ext4.define('LABKEY.ext4.DataViewsPanel', {
handler.call(scope || this, json);
}
},
failure : function() {
Ext4.Msg.alert('Failure');
},
failure : LABKEY.Utils.getCallbackWrapper(function(json) {
Ext4.Msg.alert('Get Configuration Failure', LABKEY.Utils.encodeHtml(json.exception));
}, null, true),
scope : this
});
},
Expand Down Expand Up @@ -1403,9 +1403,9 @@ Ext4.define('LABKEY.ext4.DataViewsPanel', {
else
this.getFullStore().load();
},
failure : function() {
Ext4.Msg.alert('Failure');
},
failure : LABKEY.Utils.getCallbackWrapper(function(json) {
Ext4.Msg.alert('Customize View Failure', LABKEY.Utils.encodeHtml(json.exception));
}, null, true),
scope : this
});
}
Expand Down