inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated use of getAlfrescoApi() #1094

Browse Source 
remove getAlfrescoApi from auth #1094
This commit is contained in:
Eugenio Romano
2016-11-28 14:04:58 +00:00
parent eed6902428
commit d87a768d20
18 changed files with 73 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts
View File

@@ -17,9 +17,10 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Rx';
import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core';
import { ExternalContent } from '../components/widgets/core/external-content';
import { ExternalContentLink } from '../components/widgets/core/external-content-link';
import { AlfrescoApi } from 'alfresco-js-api';
@Injectable()
export class ActivitiAlfrescoContentService {
@@ -27,7 +28,7 @@ export class ActivitiAlfrescoContentService {
static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error';
static GENERIC_ERROR_MESSAGE: string = 'Server error';
constructor(private authService: AlfrescoAuthenticationService) {
constructor(private authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) {
}
/**
@@ -38,7 +39,7 @@ export class ActivitiAlfrescoContentService {
* @returns {null}
*/
getAlfrescoNodes(accountId: string, folderId: string): Observable<[ExternalContent]> {
let apiService: any = this.authService.getAlfrescoApi();
let apiService: AlfrescoApi = this.apiService.getInstance();
let accountShortId = accountId.replace('alfresco-', '');
return Observable.fromPromise(apiService.activiti.alfrescoApi.getContentInFolder(accountShortId, folderId))
.map(this.toJsonArray)
@@ -54,7 +55,7 @@ export class ActivitiAlfrescoContentService {
* @returns {null}
*/
linkAlfrescoNode(accountId: string, node: ExternalContent, siteId: string): Observable<ExternalContentLink> {
let apiService: any = this.authService.getAlfrescoApi();
let apiService: AlfrescoApi = this.apiService.getInstance();
return Observable.fromPromise(apiService.activiti.contentApi.createTemporaryRelatedContent({
link: true,
name: node.title,