Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Fixed Theme.errors clash with Ember Data Model's errors property (#16106)

Browse source 
no issue

- the Ember Data `Model` class has an `errors` property by default that
is set to a `DS.Errors` instance but the Theme model was overriding that
with an `errors` attr
- it hasn't been an issue so far but causes problems in Ember/Ember Data
3.28.x because that tries to use the `DS.Errors` interface on the
overridden attr property which then throws errors because the `errors`
attr doesn't have the right methods
This commit is contained in:
Kevin Ansfield 2023-02-28 13:28:32 +00:00 • committed by GitHub
parent d04a1bd4d0
commit 26d05aecd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ghost/admin/app/components/gh-nav-menu/footer.js
View file

@ -31,12 +31,12 @@ export default class Footer extends Component {
canActivate: false, canActivate: false,
// Warnings will only be set for developers, otherwise it will always be empty // Warnings will only be set for developers, otherwise it will always be empty
warnings: this.themeManagement.activeTheme.warnings, warnings: this.themeManagement.activeTheme.warnings,
errors: this.themeManagement.activeTheme.errors errors: this.themeManagement.activeTheme.gscanErrors
}); });
} }
get hasThemeErrors() { get hasThemeErrors() {
return this.themeManagement.activeTheme && this.themeManagement.activeTheme.errors.length; return this.themeManagement.activeTheme && this.themeManagement.activeTheme.gscanErrors.length;
} }
// equivalent to "left: auto; right: -20px" // equivalent to "left: auto; right: -20px"

2
ghost/admin/app/components/modals/design/install-theme.js
View file

@ -91,7 +91,7 @@ export default class InstallThemeModal extends Component {
this.installedTheme = this.store.peekRecord('theme', result.themes[0].name); this.installedTheme = this.store.peekRecord('theme', result.themes[0].name);
this.validationWarnings = this.installedTheme.warnings || []; this.validationWarnings = this.installedTheme.warnings || [];
this.validationErrors = this.installedTheme.errors || []; this.validationErrors = this.installedTheme.gscanErrors || [];
this.fatalValidationErrors = []; this.fatalValidationErrors = [];
// activate but prevent additional error modal from showing // activate but prevent additional error modal from showing

4
ghost/admin/app/components/modals/design/upload-theme.js
View file

@ -129,8 +129,8 @@ export default class UploadThemeModal extends Component {
// Ghost differentiates between errors and fatal errors // Ghost differentiates between errors and fatal errors
// You can't activate a theme with fatal errors, but with errors. // You can't activate a theme with fatal errors, but with errors.
if (theme.errors?.length > 0) { if (theme.gscanErrors?.length > 0) {
this.validationErrors = theme.errors; this.validationErrors = theme.gscanErrors;
} }
} }

2
ghost/admin/app/models/theme.js
View file

@ -4,7 +4,7 @@ import {isBlank} from '@ember/utils';
export default Model.extend({ export default Model.extend({
active: attr('boolean'), active: attr('boolean'),
errors: attr('raw', {defaultValue: () => []}), gscanErrors: attr('raw', {defaultValue: () => []}), // renamed from 'errors' to avoid clash with Ember Data Model's `errors` property
name: attr('string'), name: attr('string'),
package: attr('raw'), package: attr('raw'),
templates: attr('raw', {defaultValue: () => []}), templates: attr('raw', {defaultValue: () => []}),

6
ghost/admin/app/serializers/theme.js
View file

@ -1,5 +1,11 @@
import ApplicationSerializer from './application'; import ApplicationSerializer from './application';
import classic from 'ember-classic-decorator';
@classic
export default class Theme extends ApplicationSerializer { export default class Theme extends ApplicationSerializer {
primaryKey = 'name'; primaryKey = 'name';
attrs = {
gscanErrors: {key: 'errors'}
};
} }