Browse Source

Fix for roles view.

pull/514/head
Sebastian 6 years ago
parent
commit
9a1de19b3a
  1. 4
      backend/src/Squidex/Areas/Api/Controllers/Apps/Models/RoleDto.cs
  2. 1
      frontend/app/framework/angular/forms/editors/autocomplete.component.html
  3. 2
      frontend/app/framework/angular/forms/editors/autocomplete.component.ts

4
backend/src/Squidex/Areas/Api/Controllers/Apps/Models/RoleDto.cs

@ -76,12 +76,12 @@ namespace Squidex.Areas.Api.Controllers.Apps.Models
if (!IsDefaultRole) if (!IsDefaultRole)
{ {
if (controller.HasPermission(AllPermissions.AppRolesUpdate, app) && NumClients == 0 && NumContributors == 0) if (controller.HasPermission(AllPermissions.AppRolesUpdate, app))
{ {
AddPutLink("update", controller.Url<AppRolesController>(x => nameof(x.PutRole), values)); AddPutLink("update", controller.Url<AppRolesController>(x => nameof(x.PutRole), values));
} }
if (controller.HasPermission(AllPermissions.AppRolesDelete, app)) if (controller.HasPermission(AllPermissions.AppRolesDelete, app) && NumClients == 0 && NumContributors == 0)
{ {
AddDeleteLink("delete", controller.Url<AppRolesController>(x => nameof(x.DeleteRole), values)); AddDeleteLink("delete", controller.Url<AppRolesController>(x => nameof(x.DeleteRole), values));
} }

1
frontend/app/framework/angular/forms/editors/autocomplete.component.html

@ -14,7 +14,6 @@
<i class="icon-{{icon}}" [class.icon-spinner2]="snapshot.isLoading" [class.spin2]="snapshot.isLoading"></i> <i class="icon-{{icon}}" [class.icon-spinner2]="snapshot.isLoading" [class.spin2]="snapshot.isLoading"></i>
</div> </div>
<ng-container *sqxModal="snapshot.suggestedItems.length > 0" position="bottom-left"> <ng-container *sqxModal="snapshot.suggestedItems.length > 0" position="bottom-left">
<div class="control-dropdown" [sqxAnchoredTo]="input" [style.width]="dropdownWidth" position="bottom-left" #container @fade> <div class="control-dropdown" [sqxAnchoredTo]="input" [style.width]="dropdownWidth" position="bottom-left" #container @fade>
<div *ngFor="let item of snapshot.suggestedItems; let i = index" class="control-dropdown-item control-dropdown-item-selectable" <div *ngFor="let item of snapshot.suggestedItems; let i = index" class="control-dropdown-item control-dropdown-item-selectable"

2
frontend/app/framework/angular/forms/editors/autocomplete.component.ts

@ -173,7 +173,7 @@ export class AutocompleteComponent extends StatefulControlComponent<State, Reado
public setDisabledState(isDisabled: boolean): void { public setDisabledState(isDisabled: boolean): void {
if (isDisabled) { if (isDisabled) {
this.reset(); this.resetState();
this.queryInput.disable(NO_EMIT); this.queryInput.disable(NO_EMIT);
} else { } else {
this.queryInput.enable(NO_EMIT); this.queryInput.enable(NO_EMIT);

Loading…
Cancel
Save