Browse Source

1) Version updated

2) Close #25, Swagger Documentation broken for GetSchemas
pull/65/head
Sebastian Stehle 10 years ago
parent
commit
0b83f24c6e
  1. 3
      src/Squidex/Controllers/Api/Assets/AssetController.cs
  2. 6
      src/Squidex/Controllers/Api/Schemas/SchemasController.cs
  3. 38
      src/Squidex/package.json

3
src/Squidex/Controllers/Api/Assets/AssetController.cs

@ -52,6 +52,7 @@ namespace Squidex.Controllers.Api.Assets
/// <summary>
/// Get assets.
/// </summary>
/// <param name="app">The app where the assets belong to.</param>
/// <param name="skip">The number of assets to skip.</param>
/// <param name="take">The number of assets to take.</param>
/// <param name="query">The query to limit the files by name.</param>
@ -63,7 +64,7 @@ namespace Squidex.Controllers.Api.Assets
[HttpGet]
[Route("apps/{app}/assets/")]
[ProducesResponseType(typeof(AssetsDto), 200)]
public async Task<IActionResult> GetAssets([FromQuery] string query = null, [FromQuery] string mimeTypes = null, [FromQuery] int skip = 0, [FromQuery] int take = 10)
public async Task<IActionResult> GetAssets(string app, [FromQuery] string query = null, [FromQuery] string mimeTypes = null, [FromQuery] int skip = 0, [FromQuery] int take = 10)
{
var mimeTypeList = new HashSet<string>();

6
src/Squidex/Controllers/Api/Schemas/SchemasController.cs

@ -44,6 +44,7 @@ namespace Squidex.Controllers.Api.Schemas
/// <summary>
/// Get schemas.
/// </summary>
/// <param name="app">The name of the app to create the schema to.</param>
/// <returns>
/// 200 => Schemas returned.
/// 404 => App not found.
@ -51,7 +52,7 @@ namespace Squidex.Controllers.Api.Schemas
[HttpGet]
[Route("apps/{app}/schemas/")]
[ProducesResponseType(typeof(SchemaDto[]), 200)]
public async Task<IActionResult> GetSchemas()
public async Task<IActionResult> GetSchemas(string app)
{
var schemas = await schemaRepository.QueryAllAsync(AppId);
@ -64,6 +65,7 @@ namespace Squidex.Controllers.Api.Schemas
/// Get a schema by name.
/// </summary>
/// <param name="name">The name of the schema to retrieve.</param>
/// <param name="app">The name of the app to create the schema to.</param>
/// <returns>
/// 200 => Schema found.
/// 404 => Schema or app not found.
@ -71,7 +73,7 @@ namespace Squidex.Controllers.Api.Schemas
[HttpGet]
[Route("apps/{app}/schemas/{name}/")]
[ProducesResponseType(typeof(SchemaDetailsDto[]), 200)]
public async Task<IActionResult> GetSchema(string name)
public async Task<IActionResult> GetSchema(string app, string name)
{
var entity = await schemaRepository.FindSchemaAsync(AppId, name);

38
src/Squidex/package.json

@ -15,32 +15,32 @@
"build:clean": "rimraf wwwroot/build"
},
"dependencies": {
"@angular/animations": "4.0.1",
"@angular/common": "4.0.1",
"@angular/compiler": "4.0.1",
"@angular/core": "4.0.1",
"@angular/forms": "4.0.1",
"@angular/http": "4.0.1",
"@angular/platform-browser": "4.0.1",
"@angular/platform-browser-dynamic": "4.0.1",
"@angular/router": "4.0.1",
"angular-progress-http": "^0.4.1",
"@angular/animations": "4.0.2",
"@angular/common": "4.0.2",
"@angular/compiler": "4.0.2",
"@angular/core": "4.0.2",
"@angular/forms": "4.0.2",
"@angular/http": "4.0.2",
"@angular/platform-browser": "4.0.2",
"@angular/platform-browser-dynamic": "4.0.2",
"@angular/router": "4.0.2",
"angular-progress-http": "0.5.0",
"babel-polyfill": "6.23.0",
"bootstrap": "4.0.0-alpha.6",
"core-js": "2.4.1",
"moment": "2.18.1",
"mousetrap": "1.6.1",
"ng2-dnd": "^4.0.2",
"ng2-dnd": "4.0.2",
"oidc-client": "1.3.0",
"pikaday": "1.5.1",
"progressbar.js": "^1.0.1",
"redoc": "1.12.1",
"progressbar.js": "1.0.1",
"redoc": "1.13.0",
"rxjs": "5.3.0",
"zone.js": "0.8.5"
},
"devDependencies": {
"@angular/compiler-cli": "4.0.1",
"@angular/tsc-wrapped": "4.0.1",
"@angular/compiler-cli": "4.0.2",
"@angular/tsc-wrapped": "4.0.2",
"@ngtools/webpack": "1.3.0",
"@types/core-js": "0.9.35",
"@types/jasmine": "2.5.43",
@ -58,7 +58,7 @@
"html-webpack-plugin": "2.28.0",
"istanbul-instrumenter-loader": "0.2.0",
"jasmine-core": "2.5.2",
"karma": "1.5.0",
"karma": "1.6.0",
"karma-chrome-launcher": "2.0.0",
"karma-cli": "1.0.1",
"karma-coverage": "1.1.1",
@ -77,11 +77,11 @@
"sass-loader": "6.0.3",
"style-loader": "0.16.1",
"tslint": "4.5.1",
"tslint-loader": "3.4.3",
"typemoq": "1.4.1",
"tslint-loader": "3.5.2",
"typemoq": "1.4.2",
"typescript": "2.2.2",
"underscore": "1.8.3",
"webpack": "2.3.3",
"webpack": "2.4.1",
"webpack-dev-server": "2.4.2",
"webpack-merge": "4.1.0"
}

Loading…
Cancel
Save