From 8501db36b95832b4cb1bf618b3800534f9165dc3 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 28 Feb 2017 21:29:28 +0100 Subject: [PATCH] Small spelling error. --- .../ContentApi/Generator/SchemasSwaggerGenerator.cs | 4 ++-- .../features/schemas/pages/schemas/schema-form.component.html | 2 +- .../features/schemas/pages/schemas/schema-form.component.ts | 2 ++ src/Squidex/app/shared/components/app-form.component.html | 2 +- src/Squidex/app/shared/components/app-form.component.ts | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs b/src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs index 89f76fa9f..e93b1f57c 100644 --- a/src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs +++ b/src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs @@ -165,7 +165,7 @@ namespace Squidex.Controllers.ContentApi.Generator private void GenerateSchemasOperations(IEnumerable schemas) { - foreach (var schema in schemas.Select(x => x.Schema)) + foreach (var schema in schemas.Where(x => x.IsPublished).Select(x => x.Schema)) { GenerateSchemaOperations(schema); } @@ -310,7 +310,7 @@ namespace Squidex.Controllers.ContentApi.Generator if (entityName != null) { - operation.AddPathParameter("id", JsonObjectType.String, $"The id of the {entityName} (GUID)."); + operation.AddPathParameter("id", JsonObjectType.String, $"The id of the {entityName} content (GUID)."); operation.AddResponse("404", $"App, schema or {entityName} content not found."); } diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html index 8ff470085..4e3fd75c2 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html @@ -13,7 +13,7 @@ - The schema name becomes part of the api url,
e.g https://{{appName}}.squidex.io/{{schemaName | async}}/. + The schema name becomes part of the api url,
e.g {{apiUrl.buildUrl("api/content/")}}{{appName}}/{{schemaName | async}}/.
It must contain lower case letters (a-z), numbers and dashes only, and cannot be longer than 40 characters. The name cannot be changed later. diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts index 8c24bcc55..cf3ffcfec 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts @@ -10,6 +10,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; import { + ApiUrlConfig, AuthService, CreateSchemaDto, DateTime, @@ -56,6 +57,7 @@ export class SchemaFormComponent { .merge(this.createForm.get('name').valueChanges.map(n => n || FALLBACK_NAME)); constructor( + public readonly apiUrl: ApiUrlConfig, private readonly schemas: SchemasService, private readonly formBuilder: FormBuilder, private readonly authService: AuthService diff --git a/src/Squidex/app/shared/components/app-form.component.html b/src/Squidex/app/shared/components/app-form.component.html index 1855817c8..905aa2e59 100644 --- a/src/Squidex/app/shared/components/app-form.component.html +++ b/src/Squidex/app/shared/components/app-form.component.html @@ -13,7 +13,7 @@ - The app name becomes part of the api url,
e.g https://{{appName | async}}.squidex.io/. + The app name becomes part of the api url,
e.g {{apiUrl.buildUrl("api/content/")}}{{appName | async}}.squidex.io/.
diff --git a/src/Squidex/app/shared/components/app-form.component.ts b/src/Squidex/app/shared/components/app-form.component.ts index 5bf4f1bcc..3866aa5d3 100644 --- a/src/Squidex/app/shared/components/app-form.component.ts +++ b/src/Squidex/app/shared/components/app-form.component.ts @@ -9,7 +9,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; -import { ValidatorsEx } from 'framework'; +import { ApiUrlConfig, ValidatorsEx } from 'framework'; import { AppsStoreService } from './../services/apps-store.service'; import { AppDto, CreateAppDto } from './../services/apps.service'; @@ -45,6 +45,7 @@ export class AppFormComponent { .merge(this.createForm.get('name').valueChanges.map(n => n || FALLBACK_NAME)); constructor( + public readonly apiUrl: ApiUrlConfig, private readonly appsStore: AppsStoreService, private readonly formBuilder: FormBuilder ) {