From a9a2a9d9ae58b4f4654097bedc3992a0874dda97 Mon Sep 17 00:00:00 2001
From: Mario Romano <dnamario@hotmail.com>
Date: Tue, 6 Sep 2016 11:53:08 +0100
Subject: [PATCH 1/4] return also user and password from login component

---
 .../src/components/alfresco-login.component.ts                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
index 4a5129e601..8e1cf3bee0 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
@@ -150,7 +150,7 @@ export class AlfrescoLoginComponent implements OnInit {
             .subscribe(
             (token: any) => {
                 this.success = true;
-                this.onSuccess.emit(token);
+                this.onSuccess.emit({token: token, username: value.username, password: value.password});
             },
             (err: any) => {
                 this.enableError();

From f9210ba048d9fc6357209c4504834f66227e9412 Mon Sep 17 00:00:00 2001
From: Mario Romano <dnamario@hotmail.com>
Date: Tue, 6 Sep 2016 15:21:55 +0100
Subject: [PATCH 2/4] change needed for health care app

---
 ng2-components/ng2-activiti-form/README.md                   | 1 +
 .../src/components/activiti-form.component.html              | 2 +-
 .../src/components/activiti-form.component.ts                | 5 +++++
 ng2-components/ng2-activiti-tasklist/index.ts                | 1 +
 ng2-components/ng2-alfresco-datatable/README.md              | 1 +
 ng2-components/ng2-alfresco-documentlist/README.md           | 1 +
 .../src/components/document-list.html                        | 2 +-
 .../src/components/document-list.ts                          | 3 +++
 .../src/data/share-datatable-adapter.ts                      | 2 +-
 .../src/services/document-list.service.ts                    | 2 +-
 10 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ng2-components/ng2-activiti-form/README.md b/ng2-components/ng2-activiti-form/README.md
index e0ddb5af56..311cdeaa50 100644
--- a/ng2-components/ng2-activiti-form/README.md
+++ b/ng2-components/ng2-activiti-form/README.md
@@ -125,6 +125,7 @@ The recommended set of properties can be found in the following table:
 | showTitle | boolean | true | Toggle rendering of the form title. |
 | showCompleteButton | boolean | true | Toggle rendering of the `Complete` outcome button. |
 | showSaveButton | boolean | true | Toggle rendering of the `Save` outcome button. |
+| showDebugButton | boolean | false | Toggle debug options. |
 | readOnly | boolean | false | Toggle readonly state of the form. Enforces all form widgets render readonly if enabled. |
 | showRefreshButton | boolean | true | Toggle rendering of the `Refresh` button. |
 | saveMetadata | boolean | false | Store the value of the form as metadata. |
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
index 44994aa77a..0379e071e0 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
+++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
@@ -39,7 +39,7 @@
 For debugging and data visualisation purposes,
 will be removed during future revisions
 -->
-<div class="activiti-form-debug-container">
+<div  *ngIf="showDebugButton" class="activiti-form-debug-container">
 
     <div style="float: right">
         <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="switch-1" [class.is-checked]="debugMode">
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
index 9481157b5e..2c5151d877 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
@@ -60,6 +60,8 @@ import { WidgetVisibilityService }  from './../services/widget-visibility.servic
  *
  *   {showRefreshButton} boolean - to hide the refresh button of the form pass false, default true;
  *
+ *   {showDebugButton} boolean - to show the debug options, default false;
+ *
  *   {showCompleteButton} boolean - to hide the complete button of the form pass false, default true;
  *
  *   {showSaveButton} boolean - to hide the save button of the form pass false, default true;
@@ -124,6 +126,9 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
     @Input()
     showSaveButton: boolean = true;
 
+    @Input()
+    showDebugButton: boolean = false;
+
     @Input()
     readOnly: boolean = false;
 
diff --git a/ng2-components/ng2-activiti-tasklist/index.ts b/ng2-components/ng2-activiti-tasklist/index.ts
index dc72a4b407..f8e68027dc 100644
--- a/ng2-components/ng2-activiti-tasklist/index.ts
+++ b/ng2-components/ng2-activiti-tasklist/index.ts
@@ -20,5 +20,6 @@ import { ActivitiTaskDetails } from './src/components/activiti-task-details.comp
 import { ActivitiFilters } from './src/components/activiti-filters.component';
 
 export * from './src/components/activiti-tasklist.component';
+export * from './src/services/activiti-tasklist.service';
 
 export const ALFRESCO_TASKLIST_DIRECTIVES: [any] = [ActivitiFilters, ActivitiTaskList, ActivitiTaskDetails];
diff --git a/ng2-components/ng2-alfresco-datatable/README.md b/ng2-components/ng2-alfresco-datatable/README.md
index 7f68b788ff..d533f275cc 100644
--- a/ng2-components/ng2-alfresco-datatable/README.md
+++ b/ng2-components/ng2-alfresco-datatable/README.md
@@ -135,6 +135,7 @@ export class MyView {
 | data | DataTableAdapter | instance of **ObjectDataTableAdapter** | data source |
 | multiselect | boolean | false | Toggles multiple row selection, renders checkboxes at the beginning of each row |
 | actions | boolean | false | Toggles data actions column |
+| fallbackThubnail | string |  | Fallback image for row ehre thubnail is missing|
 
 ### Events
 
diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md
index 5d11880dab..5d0880d7c9 100644
--- a/ng2-components/ng2-alfresco-documentlist/README.md
+++ b/ng2-components/ng2-alfresco-documentlist/README.md
@@ -98,6 +98,7 @@ Also make sure you include these dependencies in your `index.html` file:
 | navigate | boolean | true | Toggles navigation to folder content or file preview |
 | navigationMode | string (click\|dblclick) | dblclick | User interaction for folder navigation or file preview |
 | thumbnails | boolean | false | Show document thumbnails rather than icons |
+| fallbackThubnail | string |  | Fallback image for row ehre thubnail is missing|
 | multiselect | boolean | false | Toggles multiselect mode |
 | contentActions | boolean | false | Toggles content actions for each row |
 | contextMenuActions | boolean | false | Toggles context menus for each row |
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
index 06f06bd90c..18395008d0 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
@@ -2,7 +2,7 @@
     [data]="data"
     [actions]="contentActions"
     [multiselect]="multiselect"
-    [fallbackThumbnail]="baseComponentPath + '/img/ft_ic_miscellaneous.svg'"
+    [fallbackThumbnail]="fallbackThubnail"
     (showRowContextMenu)="onShowRowContextMenu($event)"
     (showRowActionsMenu)="onShowRowActionsMenu($event)"
     (executeRowAction)="onExecuteRowAction($event)"
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
index fa79a3d14d..fb75acfbcf 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
@@ -73,6 +73,9 @@ export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, Af
 
     baseComponentPath = __moduleName.replace('/components/document-list.js', '');
 
+    @Input()
+    fallbackThubnail: string = this.baseComponentPath + '/img/ft_ic_miscellaneous.svg';
+
     @Input()
     navigate: boolean = true;
 
diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
index 7df12aca26..12f369b2d8 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
@@ -325,7 +325,7 @@ export class ShareDataRow implements DataRow {
 }
 
 export interface RowFilter {
-    (value: ShareDataRow, index: number, array: ShareDataRow[]): boolean;
+    (value: ShareDataRow, index: number, array: ShareDataRow[]): any;
 }
 
 export interface ImageResolver {
diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
index 2fd096a041..4ac867d7b5 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
@@ -69,7 +69,7 @@ export class DocumentListService {
         let nodeId = '-root-';
         let params: any = {
             relativePath: folder,
-            include: ['path']
+            include: ['path','properties']
         };
 
         if (opts) {

From 3e0fd310c5fea135e3bc9b959b2c2bc0bf2781df Mon Sep 17 00:00:00 2001
From: Mario Romano <dnamario@hotmail.com>
Date: Tue, 6 Sep 2016 16:22:30 +0100
Subject: [PATCH 3/4] fix tests

---
 .../src/services/document-list.service.spec.ts                | 4 ++--
 .../src/services/document-list.service.ts                     | 2 +-
 .../src/components/alfresco-login.component.spec.ts           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts
index db0643d54d..489283912f 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts
@@ -101,7 +101,7 @@ describe('DocumentListService', () => {
         service.getFolder('fake-node-id').subscribe(e => {
             expect(jasmine.Ajax.requests.mostRecent().url)
                 .toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/' +
-                    'children?include=path&relativePath=fake-node-id');
+                    'children?include=path%2Cproperties&relativePath=fake-node-id');
             expect(jasmine.Ajax.requests.mostRecent().method)
                 .toBe('GET');
             done();
@@ -116,7 +116,7 @@ describe('DocumentListService', () => {
         service.getFolder('fake-node-id', {maxItems: 10}).subscribe(e => {
             expect(jasmine.Ajax.requests.mostRecent().url)
                 .toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/' +
-                    'children?maxItems=10&include=path&relativePath=fake-node-id');
+                    'children?maxItems=10&include=path%2Cproperties&relativePath=fake-node-id');
             expect(jasmine.Ajax.requests.mostRecent().method)
                 .toBe('GET');
             done();
diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
index 4ac867d7b5..48174eec64 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
@@ -69,7 +69,7 @@ export class DocumentListService {
         let nodeId = '-root-';
         let params: any = {
             relativePath: folder,
-            include: ['path','properties']
+            include: ['path', 'properties']
         };
 
         if (opts) {
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
index 520e4c7688..25a0314cca 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
@@ -353,7 +353,7 @@ describe('AlfrescoLogin', () => {
         expect(component.success).toBe(true);
         expect(compiled.querySelector('#login-success')).toBeDefined();
         expect(compiled.querySelector('#login-success').innerHTML).toEqual('LOGIN.MESSAGES.LOGIN-SUCCESS');
-        expect(component.onSuccess.emit).toHaveBeenCalledWith(true);
+        expect(component.onSuccess.emit).toHaveBeenCalledWith({ token: true, username: 'fake-username', password: 'fake-password' });
     });
 
     it('should emit onError event after the login has failed', () => {

From d2fa3fdb4395851f30c23afdd8c5d4b358fc1bdb Mon Sep 17 00:00:00 2001
From: Mario Romano <dnamario@hotmail.com>
Date: Tue, 6 Sep 2016 19:19:52 +0100
Subject: [PATCH 4/4] #687 fix rebase

---
 .../src/components/alfresco-login.component.ts                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
index 8e1cf3bee0..35e94c38cb 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
@@ -150,7 +150,7 @@ export class AlfrescoLoginComponent implements OnInit {
             .subscribe(
             (token: any) => {
                 this.success = true;
-                this.onSuccess.emit({token: token, username: value.username, password: value.password});
+                this.onSuccess.emit({token: token, username: values.username, password: values.password});
             },
             (err: any) => {
                 this.enableError();