tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix for save button.

pull/613/head
Sebastian 5 years ago
parent
c674fc0e21
commit
742d6563c6
3 changed files with 47 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      backend/src/Squidex.Domain.Apps.Entities/History/NotifoService.cs
  2. 2
      backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  3. 66
      frontend/app/features/content/pages/content/content-page.component.html

13
backend/src/Squidex.Domain.Apps.Entities/History/NotifoService.cs
View File

@ -200,7 +200,12 @@ namespace Squidex.Domain.Apps.Entities.History
}
}
await client.Events.PostEventsAsync(options.AppId, new PublishManyRequestDto { Requests = requests });
var request = new PublishManyRequestDto
{
Requests = requests
};
await client.Events.PostEventsAsync(options.AppId, request);
}
foreach (var @event in events)
@ -220,10 +225,12 @@ namespace Squidex.Domain.Apps.Entities.History
try
{
await client.Users.PostAllowedTopicAsync(options.AppId, userId, new AddAllowedTopicRequest
var request = new AddAllowedTopicRequest
{
Prefix = GetAppPrefix(contributorAssigned)
});
};
await client.Users.PostAllowedTopicAsync(options.AppId, userId, request);
}
catch (NotifoException ex) when (ex.StatusCode == 404)
{

2
backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
View File

@ -31,7 +31,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
<PackageReference Include="Notifo.SDK" Version="1.0.0-alpha11" />
<PackageReference Include="Notifo.SDK" Version="1.0.0-alpha9" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />

66
frontend/app/features/content/pages/content/content-page.component.html
View File

@ -40,47 +40,49 @@
<ng-container menu>
<ng-container *ngIf="content; else noContent">
<ng-container *ngIf="(contentTab | async) === 'fields'; else referenceHeader">
<sqx-notifo topic="apps/{{contentsState.appId}}/schemas/{{schema?.name}}/contents/{{content.id}}"></sqx-notifo>
<sqx-notifo topic="apps/{{contentsState.appId}}/schemas/{{schema?.name}}/contents/{{content.id}}"></sqx-notifo>
<sqx-preview-button [schema]="schema" [content]="content"></sqx-preview-button>
<ng-container *ngIf="contentTab | async; let tab">
<ng-container *ngIf="tab !== 'editor'">
<button type="button" class="btn btn-primary ml-1" (click)="publish()">
{{ 'contents.publishAll' | sqxTranslate }}
</button>
<ng-container *ngIf="content?.canDelete">
<button type="button" class="btn btn-outline-secondary" (click)="dropdown.toggle()" [class.active]="dropdown.isOpen | async" #buttonOptions>
<i class="icon-dots"></i>
<button type="button" class="btn btn-primary ml-1" (click)="validate()">
{{ 'contents.validate' | sqxTranslate }}
</button>
</ng-container>
<ng-container *sqxModal="dropdown;closeAlways:true">
<div class="dropdown-menu" [sqxAnchoredTo]="buttonOptions" @fade>
<a class="dropdown-item dropdown-item-delete"
(sqxConfirmClick)="delete()"
confirmTitle="i18n:contents.deleteConfirmTitle"
confirmText="i18n:contents.deleteConfirmText"
confirmRememberKey="deleteContent">
{{ 'common.delete' | sqxTranslate }}
</a>
</div>
<ng-container *ngIf="tab === 'editor'">
<sqx-preview-button [schema]="schema" [content]="content"></sqx-preview-button>
<ng-container *ngIf="content?.canDelete">
<button type="button" class="btn btn-outline-secondary" (click)="dropdown.toggle()" [class.active]="dropdown.isOpen | async" #buttonOptions>
<i class="icon-dots"></i>
</button>
<ng-container *sqxModal="dropdown;closeAlways:true">
<div class="dropdown-menu" [sqxAnchoredTo]="buttonOptions" @fade>
<a class="dropdown-item dropdown-item-delete"
(sqxConfirmClick)="delete()"
confirmTitle="i18n:contents.deleteConfirmTitle"
confirmText="i18n:contents.deleteConfirmText"
confirmRememberKey="deleteContent">
{{ 'common.delete' | sqxTranslate }}
</a>
</div>
</ng-container>
</ng-container>
</ng-container>
<ng-container *ngIf="content?.canUpdate">
<button type="submit" class="btn btn-primary ml-1" title="i18n:common.saveShortcut">
{{ 'common.save' | sqxTranslate }}
</button>
<ng-container *ngIf="content?.canUpdate">
<button type="submit" class="btn btn-primary ml-1" title="i18n:common.saveShortcut">
{{ 'common.save' | sqxTranslate }}
</button>
<sqx-shortcut keys="ctrl+s" (trigger)="saveAndPublish()"></sqx-shortcut>
<sqx-shortcut keys="ctrl+s" (trigger)="saveAndPublish()"></sqx-shortcut>
</ng-container>
</ng-container>
</ng-container>
<ng-template #referenceHeader>
<button type="button" class="btn btn-primary ml-1" (click)="publish()">
{{ 'contents.publishAll' | sqxTranslate }}
</button>
<button type="button" class="btn btn-primary ml-1" (click)="validate()">
{{ 'contents.validate' | sqxTranslate }}
</button>
</ng-template>
</ng-container>
<ng-template #noContent>

Write Preview
Loading…
Cancel
Save