Browse Source

Fix for selecting content.

pull/372/head
Sebastian Stehle 7 years ago
parent
commit
d01640e13e
  1. 2
      src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs
  2. 2
      src/Squidex/app/features/content/pages/content/content-page.component.ts
  3. 2
      src/Squidex/app/features/content/shared/content-item.component.html
  4. 8
      src/Squidex/app/shared/components/markdown-editor.component.ts
  5. 4
      src/Squidex/app/shared/components/rich-editor.component.ts

2
src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs

@ -142,7 +142,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Models
if (controller.HasPermission(Permissions.AppContentsDelete, app, schema))
{
AddPutLink("delete", controller.Url<ContentsController>(x => nameof(x.DeleteContent), values));
AddDeleteLink("delete", controller.Url<ContentsController>(x => nameof(x.DeleteContent), values));
}
foreach (var next in StatusFlow.Next(Status))

2
src/Squidex/app/features/content/pages/content/content-page.component.ts

@ -183,7 +183,7 @@ export class ContentPageComponent extends ResourceOwner implements CanComponentD
private loadContent(data: any) {
this.contentForm.loadContent(data);
this.contentForm.setEnabled(this.content && !this.content.canUpdate);
this.contentForm.setEnabled(!this.content || this.content.canUpdate);
}
public discardChanges() {

2
src/Squidex/app/features/content/shared/content-item.component.html

@ -11,7 +11,7 @@
</ng-template>
</td>
<td class="cell-auto" *ngFor="let field of schema.listFields; let i = index; trackBy: trackByField.bind(this)" [sqxStopClick]="isDirty || field.isInlineEditable">
<td class="cell-auto" *ngFor="let field of schema.listFields; let i = index; trackBy: trackByField.bind(this)" [sqxStopClick]="isDirty || (field.isInlineEditable && patchAllowed)">
<ng-container *ngIf="field.isInlineEditable && patchAllowed; else displayTemplate">
<sqx-content-item-editor [form]="patchForm.form" [field]="field"></sqx-content-item-editor>
</ng-container>

8
src/Squidex/app/shared/components/markdown-editor.component.ts

@ -78,6 +78,10 @@ export class MarkdownEditorComponent extends StatefulControlComponent<State, str
}
private showSelector = () => {
if (this.isDisabled) {
return;
}
this.assetsDialog.show();
}
@ -220,6 +224,10 @@ export class MarkdownEditorComponent extends StatefulControlComponent<State, str
}
private uploadFile(doc: any, file: File) {
if (this.isDisabled) {
return;
}
const uploadCursor = doc.getCursor();
const uploadText = `![Uploading file...${new Date()}]()`;

4
src/Squidex/app/shared/components/rich-editor.component.ts

@ -78,6 +78,10 @@ export class RichEditorComponent extends StatefulControlComponent<any, string> i
}
private showSelector = () => {
if (this.isDisabled) {
return;
}
this.assetsDialog.show();
}

Loading…
Cancel
Save