Browse Source

Frontend fixes.

pull/733/head
Sebastian 5 years ago
parent
commit
f24e7a57da
  1. 4
      frontend/app-config/webpack.config.js
  2. 3
      frontend/app/shared/services/schemas.service.ts
  3. 2
      frontend/app/shared/state/contents.forms.ts

4
frontend/app-config/webpack.config.js

@ -268,9 +268,9 @@ module.exports = function calculateConfig(env) {
{ from: './node_modules/ace-builds/src-min/ace.js', to: 'dependencies/ace/ace.js' }, { from: './node_modules/ace-builds/src-min/ace.js', to: 'dependencies/ace/ace.js' },
{ from: './node_modules/ace-builds/src-min/ext-language_tools.js', to: 'dependencies/ace/ext/language_tools.js' }, { from: './node_modules/ace-builds/src-min/ext-language_tools.js', to: 'dependencies/ace/ext/language_tools.js' },
{ from: './node_modules/ace-builds/src-min/ext-modelist.js', to: 'dependencies/ace/ext/modelist.js' }, { from: './node_modules/ace-builds/src-min/ext-modelist.js', to: 'dependencies/ace/ext/modelist.js' },
{ from: './node_modules/ace-builds/src-min/mode-*.js', to: 'dependencies/ace/[name].[ext]' }, { from: './node_modules/ace-builds/src-min/mode-*.js', to: 'dependencies/ace/[name][ext]' },
{ from: './node_modules/ace-builds/src-min/snippets', to: 'dependencies/ace/snippets' }, { from: './node_modules/ace-builds/src-min/snippets', to: 'dependencies/ace/snippets' },
{ from: './node_modules/ace-builds/src-min/worker-*.js', to: 'dependencies/ace/[name].[ext]' }, { from: './node_modules/ace-builds/src-min/worker-*.js', to: 'dependencies/ace/[name][ext]' },
{ from: './node_modules/video.js/dist/video.min.js', to: 'dependencies/videojs' }, { from: './node_modules/video.js/dist/video.min.js', to: 'dependencies/videojs' },
{ from: './node_modules/video.js/dist/video-js.min.css', to: 'dependencies/videojs' }, { from: './node_modules/video.js/dist/video-js.min.css', to: 'dependencies/videojs' },

3
frontend/app/shared/services/schemas.service.ts

@ -152,9 +152,12 @@ export class SchemaDto {
}; };
const result: any = { const result: any = {
previewUrls: this.previewUrls,
properties: cleanup(this.properties), properties: cleanup(this.properties),
category: this.category, category: this.category,
scripts: this.scripts, scripts: this.scripts,
isPublished: this.isPublished,
fieldRules: this.fieldRules,
fieldsInLists: this.fieldsInLists, fieldsInLists: this.fieldsInLists,
fieldsInReferences: this.fieldsInReferences, fieldsInReferences: this.fieldsInReferences,
fields: this.fields.map(field => { fields: this.fields.map(field => {

2
frontend/app/shared/state/contents.forms.ts

@ -495,7 +495,7 @@ export class ObjectForm<TField extends FieldDto = FieldDto> extends AbstractCont
constructor(globals: FormGlobals, path: string, field: TField, isOptional: boolean, constructor(globals: FormGlobals, path: string, field: TField, isOptional: boolean,
private readonly partition: string, private readonly partition: string,
) { ) {
super(globals, path, field, ObjectForm.buildControl(field, isOptional, true), isOptional); super(globals, path, field, ObjectForm.buildControl(field, isOptional, false), isOptional);
} }
public get(field: string | { name: string }): FieldItemForm | undefined { public get(field: string | { name: string }): FieldItemForm | undefined {

Loading…
Cancel
Save