[CORD-1927] Fixing generate url for service models
Change-Id: I08d0d853ba2ab041626e133d079ab4562d73171e
(cherry picked from commit 6349847ecd1040111de5e7def26304e9e093cb92)
diff --git a/src/app/views/crud/crud.relations.service.ts b/src/app/views/crud/crud.relations.service.ts
index 092dda8..9dd3656 100644
--- a/src/app/views/crud/crud.relations.service.ts
+++ b/src/app/views/crud/crud.relations.service.ts
@@ -18,12 +18,12 @@
import {IXosModelRelation} from './crud';
import {IXosModelStoreService} from '../../datasources/stores/model.store';
-import {IXosModelDiscovererService} from '../../datasources/helpers/model-discoverer.service';
import * as _ from 'lodash';
import {IXosFormCfg} from '../../core/form/form';
import {IXosTableCfg} from '../../core/table/table';
import {IXosConfigHelpersService} from '../../core/services/helpers/config.helpers';
import {Subscription} from 'rxjs';
+import {IXosModeldefsCache} from '../../datasources/helpers/modeldefs.service';
interface IXosCrudRelationBaseTabData {
model: any;
@@ -51,16 +51,16 @@
'$log',
'$q',
'XosModelStore',
- 'XosModelDiscoverer',
- 'ConfigHelpers'
+ 'ConfigHelpers',
+ 'XosModeldefsCache'
];
constructor (
private $log: ng.ILogService,
private $q: ng.IQService,
private XosModelStore: IXosModelStoreService,
- private XosModelDiscovererService: IXosModelDiscovererService,
- private ConfigHelpers: IXosConfigHelpersService
+ private ConfigHelpers: IXosConfigHelpersService,
+ private XosModeldefsCache: IXosModeldefsCache
) {}
public getModel (r: IXosModelRelation, id: string | number): Promise<IXosCrudRelationFormTabData> {
@@ -72,7 +72,7 @@
const data: IXosCrudRelationFormTabData = {
model: item,
- formConfig: this.XosModelDiscovererService.get(r.model).formCfg,
+ formConfig: this.XosModeldefsCache.get(r.model).formCfg,
class: angular ? 'full' : 'empty'
};
@@ -96,7 +96,7 @@
match[`${r.on_field.toLowerCase()}_id`] = source_id;
const filtered = _.filter(items, match);
// removing search bar from table
- const tableCfg = this.XosModelDiscovererService.get(r.model).tableCfg;
+ const tableCfg = this.XosModeldefsCache.get(r.model).tableCfg;
tableCfg.filter = null;
const data: IXosCrudRelationTableTabData = {