Skip to content
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

Jump to bottom

Regression: fix code style, setup wizard error and profile page header #15041

Merged
merged 1 commit into from
Jul 23, 2019
Merged

Regression: fix code style, setup wizard error and profile page header #15041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 app/setup-wizard/client/setupWizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Template.setupWizard.onCreated(function() {
localStorage.setItem('wizard', JSON.stringify(state));

if (Meteor.userId()) {
Meteor.call('getSetupWizardParameters', (error, { settings, allowStandaloneServer }) => {
Meteor.call('getSetupWizardParameters', (error, { settings, allowStandaloneServer } = {}) => {
if (error) {
return handleError(error);
}
Expand Down
2 changes: 1 addition & 1 deletion app/theme/client/imports/general/forms.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
height: 100%;

&--new {
padding: 0 1.5rem;
padding: 1.5rem;
}

&__content {
Expand Down
6 changes: 4 additions & 2 deletions app/ui-admin/client/rooms/adminRooms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,12 @@ Template.adminRooms.onCreated(function() {
const filterReg = new RegExp(s.escapeRegExp(filter), 'i');
query = { ...discussion && { prid: { $exists: true } }, $or: [{ name: filterReg }, { t: 'd', usernames: filterReg }] };
}
types = types.filter((type) => type !== 'dicussions');

if (types.filter((type) => type !== 'dicussions').length) {
query.t = { $in: types.filter((type) => type !== 'dicussions') };
if (types.length) {
query.t = { $in: types };
}

const limit = instance.limit && instance.limit.get();
return AdminChatRoom.find(query, { limit, sort: { default: -1, name: 1 } });
};
Expand Down