Browse Source

OData fixes and alert fixes.

pull/743/head
Sebastian 4 years ago
parent
commit
29d61cb779
  1. 6
      backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs
  2. 4
      backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs
  3. 1
      frontend/app/_theme.html
  4. 7
      frontend/app/framework/angular/modals/dialog-renderer.component.html
  5. 10
      frontend/app/framework/angular/modals/dialog-renderer.component.scss
  6. 2
      frontend/app/theme/_bootstrap-vars.scss
  7. 2
      frontend/app/theme/_bootstrap.scss

6
backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs

@ -1,4 +1,4 @@
// ========================================================================== // ==========================================================================
// Squidex Headless CMS // Squidex Headless CMS
// ========================================================================== // ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschraenkt) // Copyright (c) Squidex UG (haftungsbeschraenkt)
@ -128,6 +128,10 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries
{ {
return edmModel.ParseQuery(odata).ToQuery(); return edmModel.ParseQuery(odata).ToQuery();
} }
catch (ValidationException)
{
throw;
}
catch (NotSupportedException) catch (NotSupportedException)
{ {
throw new ValidationException(T.Get("common.odataNotSupported", new { odata })); throw new ValidationException(T.Get("common.odataNotSupported", new { odata }));

4
backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs

@ -193,6 +193,10 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries
return model.ParseQuery(odata).ToQuery(); return model.ParseQuery(odata).ToQuery();
} }
catch (ValidationException)
{
throw;
}
catch (NotSupportedException) catch (NotSupportedException)
{ {
throw new ValidationException(T.Get("common.odataNotSupported", new { odata })); throw new ValidationException(T.Get("common.odataNotSupported", new { odata }));

1
frontend/app/_theme.html

@ -1119,6 +1119,7 @@
<div class="bs-component"> <div class="bs-component">
<div class="alert alert-dismissible alert-warning mt-2"> <div class="alert alert-dismissible alert-warning mt-2">
<button type="button" class="btn-close" data-dismiss="alert"></button> <button type="button" class="btn-close" data-dismiss="alert"></button>
<div class="overlay"></div>
<h4>Warning!</h4> <h4>Warning!</h4>

7
frontend/app/framework/angular/modals/dialog-renderer.component.html

@ -31,12 +31,11 @@
</ng-container> </ng-container>
<div class="notification-container notification-container-bottom-right"> <div class="notification-container notification-container-bottom-right">
<div class="alert alert-dismissible alert-{{notification.messageType}} overlayed" *ngFor="let notification of snapshot.notifications" (click)="close(notification)" @fade> <div class="alert alert-dismissible alert-{{notification.messageType}} shadowed" *ngFor="let notification of snapshot.notifications" (click)="close(notification)" @fade>
<button type="button" class="btn-close" data-dismiss="alert" (close)="close(notification)"></button> <button type="button" class="btn-close" data-dismiss="alert" (close)="close(notification)"></button>
<span [innerHTML]="notification.message | sqxTranslate | sqxMarkdown"></span> <div class="shadow"></div>
<div class="shadowed" [innerHTML]="notification.message | sqxTranslate | sqxMarkdown"></div>
<div class="overlay"></div>
</div> </div>
</div> </div>

10
frontend/app/framework/angular/modals/dialog-renderer.component.scss

@ -32,11 +32,16 @@
@include fixed(auto, auto, 0, 0); @include fixed(auto, auto, 0, 0);
} }
.overlayed { .shadow,
.shadowed {
position: relative; position: relative;
} }
.overlay { .shadowed {
z-index: 2;
}
.shadow {
@include absolute(0, auto, 0, 0); @include absolute(0, auto, 0, 0);
animation: width 10s 1 linear; animation: width 10s 1 linear;
background: $color-black; background: $color-black;
@ -44,6 +49,7 @@
opacity: .1; opacity: .1;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
z-index: 1;
} }
} }

2
frontend/app/theme/_bootstrap-vars.scss

@ -53,6 +53,8 @@ $btn-border-width: 1px;
$btn-white-space: nowrap; $btn-white-space: nowrap;
// Alerts // Alerts
$alert-color-scale: -100%;
$alert-bg-scale: 0%;
$alert-link-font-weight: normal; $alert-link-font-weight: normal;
// Labels // Labels

2
frontend/app/theme/_bootstrap.scss

@ -57,6 +57,8 @@
} }
.alert { .alert {
word-break: break-word;
.alert-link { .alert-link {
color: inherit; color: inherit;
} }

Loading…
Cancel
Save