QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 05:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix hot bugs.

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-04-26 03:09:33 +02:00
parent d14ff872d4
commit e01ad95ac3
31 changed files with 251 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/http/controllers/Accounts.js
View File

@@ -9,8 +9,6 @@ import { difference } from 'lodash';
import asyncMiddleware from '@/http/middleware/asyncMiddleware';
import JournalPoster from '@/services/Accounting/JournalPoster';
import NestedSet from '@/collection/NestedSet';
import JWTAuth from '@/http/middleware/jwtAuth';
import TenancyMiddleware from '@/http/middleware/TenancyMiddleware';
import {
mapViewRolesToConditionals,
mapFilterRolesToDynamicFilter,
@@ -30,9 +28,6 @@ export default {
router() {
const router = express.Router();
router.use(JWTAuth);
router.use(TenancyMiddleware);
router.post('/',
this.newAccount.validation,
asyncMiddleware(this.newAccount.handler));
@@ -243,7 +238,7 @@ export default {
query('stringified_filter_roles').optional().isJSON(),
query('column_sort_order').optional(),
query('column_sort_by').optional(),
query('sort_order').optional().isIn(['desc', 'asc']),
],
async handler(req, res) {
@@ -293,12 +288,13 @@ export default {
});
const dynamicFilter = new DynamicFilter(Account.tableName);
if (filter.column_sort_order) {
if (resourceFieldsKeys.indexOf(filter.column_sort_order) === -1) {
if (filter.column_sort_by) {
console.log(filter);
if (resourceFieldsKeys.indexOf(filter.column_sort_by) === -1) {
errorReasons.push({ type: 'COLUMN.SORT.ORDER.NOT.FOUND', code: 300 });
}
const sortByFilter = new DynamicFilterSortBy(
filter.column_sort_order,
filter.column_sort_by,
filter.sort_order,
);
dynamicFilter.setFilter(sortByFilter);