mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-17 22:14:58 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
dd33092985
@ -448,8 +448,16 @@ export default React.createClass({
|
|||||||
_initGroupStore: function(groupId) {
|
_initGroupStore: function(groupId) {
|
||||||
this._groupStore = GroupStoreCache.getGroupStore(MatrixClientPeg.get(), groupId);
|
this._groupStore = GroupStoreCache.getGroupStore(MatrixClientPeg.get(), groupId);
|
||||||
this._groupStore.on('update', () => {
|
this._groupStore.on('update', () => {
|
||||||
|
const summary = this._groupStore.getSummary();
|
||||||
|
if (summary.profile) {
|
||||||
|
// Default profile fields should be "" for later sending to the server (which
|
||||||
|
// requires that the fields are strings, not null)
|
||||||
|
["avatar_url", "long_description", "name", "short_description"].forEach((k) => {
|
||||||
|
summary.profile[k] = summary.profile[k] || "";
|
||||||
|
});
|
||||||
|
}
|
||||||
this.setState({
|
this.setState({
|
||||||
summary: this._groupStore.getSummary(),
|
summary,
|
||||||
error: null,
|
error: null,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user