Browse Source

combobox error fixed

pull/13804/head
Salih 4 years ago
parent
commit
d8c7c5d3eb
  1. 2
      modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/docs-admin-generate-proxy.json
  2. 2
      modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocumentsAdminController.cs
  3. 10
      modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
  4. 2
      modules/docs/src/Volo.Docs.Admin.Web/wwwroot/client-proxies/docs-admin-proxy.js
  5. 9
      modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs

2
modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/docs-admin-generate-proxy.json

@ -434,7 +434,7 @@
"uniqueName": "GetFilterItemsAsync",
"name": "GetFilterItemsAsync",
"httpMethod": "GET",
"url": "api/docs/admin/documents/GetUniqueListDocumentWithoutDetails",
"url": "api/docs/admin/documents/GetFilterItems",
"supportedVersions": [],
"parametersOnMethod": [],
"parameters": [],

2
modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocumentsAdminController.cs

@ -65,7 +65,7 @@ namespace Volo.Docs.Admin
}
[HttpGet]
[Route("GetUniqueListDocumentWithoutDetails")]
[Route("GetFilterItems")]
public async Task<List<DocumentInfoDto>> GetFilterItemsAsync()
{
return await _documentAdminAppService.GetFilterItemsAsync();

10
modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js

@ -6,7 +6,15 @@ $(function () {
return $datePicker.data().datepicker.getFormattedDate('yyyy-mm-dd');
};
var comboboxItems = service.getFilterItems();
var comboboxItems = [];
service.getFilterItems()
.then(function (result) {
comboboxItems = result;
fillOptions();
}).catch(function (error) {
abp.message.error(error);
});
var $projectId = $('#ProjectId');

2
modules/docs/src/Volo.Docs.Admin.Web/wwwroot/client-proxies/docs-admin-proxy.js

@ -63,7 +63,7 @@
volo.docs.admin.documentsAdmin.getFilterItems = function(ajaxParams) {
return abp.ajax($.extend(true, {
url: abp.appPath + 'api/docs/admin/documents/GetUniqueListDocumentWithoutDetails',
url: abp.appPath + 'api/docs/admin/documents/GetFilterItems',
type: 'GET'
}, ajaxParams));
};

9
modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs

@ -233,14 +233,5 @@ namespace Volo.Docs.Documents
LastCachedTime = x.d.LastCachedTime
});
}
// private async Task<List<FilterVersionItem>> GetFilterVersionItems(CancellationToken cancellationToken)
// {
// var q = (await GetDbSetAsync());
// return await q.Select(x => new FilterVersionItem { Version = x.Version, ProjectId = x.ProjectId, LanguageCode = x.LanguageCode , Format = x.Format })
// .Distinct()
// .OrderByDescending(x=>x.Version)
// .ToListAsync(GetCancellationToken(cancellationToken));
// }
}
}

Loading…
Cancel
Save