Fixed #2186

primefaces · Mar 1, 2017 · a590f27 · a590f27
1 parent af4cfcb
commit a590f27
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 18 deletions.
diff --git a/components/common/api.ts b/components/common/api.ts
@@ -65,6 +65,7 @@ export interface TreeNode {
 
 export interface Confirmation {
     message: string;
+    key?: string;
     icon?: string;
     header?: string;
     accept?: Function;

diff --git a/components/confirmdialog/confirmdialog.ts b/components/confirmdialog/confirmdialog.ts
@@ -77,6 +77,8 @@ export class ConfirmDialog implements AfterViewInit,OnDestroy {
     @Input() responsive: boolean = true;
 
     @Input() appendTo: any;
+
+    @Input() key: string;
 
     @ContentChild(Footer) footer;
 
@@ -99,24 +101,26 @@ export class ConfirmDialog implements AfterViewInit,OnDestroy {
     constructor(public el: ElementRef, public domHandler: DomHandler, 
             public renderer: Renderer, private confirmationService: ConfirmationService) {
         this.subscription = confirmationService.requireConfirmation$.subscribe(confirmation => {
-            this.confirmation = confirmation;
-            this.message = this.confirmation.message||this.message;
-            this.icon = this.confirmation.icon||this.icon;
-            this.header = this.confirmation.header||this.header;
-            this.rejectVisible = this.confirmation.rejectVisible == null ? this.rejectVisible : this.confirmation.rejectVisible;
-            this.acceptVisible = this.confirmation.acceptVisible == null ? this.acceptVisible : this.confirmation.acceptVisible;
-
-            if(this.confirmation.accept) {
-                this.confirmation.acceptEvent = new EventEmitter();
-                this.confirmation.acceptEvent.subscribe(this.confirmation.accept);
-            }
-
-            if(this.confirmation.reject) {
-                this.confirmation.rejectEvent = new EventEmitter();
-                this.confirmation.rejectEvent.subscribe(this.confirmation.reject);
-            }
+            if(confirmation.key === this.key) {
+                this.confirmation = confirmation;
+                this.message = this.confirmation.message||this.message;
+                this.icon = this.confirmation.icon||this.icon;
+                this.header = this.confirmation.header||this.header;
+                this.rejectVisible = this.confirmation.rejectVisible == null ? this.rejectVisible : this.confirmation.rejectVisible;
+                this.acceptVisible = this.confirmation.acceptVisible == null ? this.acceptVisible : this.confirmation.acceptVisible;
+
+                if(this.confirmation.accept) {
+                    this.confirmation.acceptEvent = new EventEmitter();
+                    this.confirmation.acceptEvent.subscribe(this.confirmation.accept);
+                }
+
+                if(this.confirmation.reject) {
+                    this.confirmation.rejectEvent = new EventEmitter();
+                    this.confirmation.rejectEvent.subscribe(this.confirmation.reject);
+                }
 
-            this.visible = true;
+                this.visible = true;
+            }
         });         
     }
 

diff --git a/showcase/demo/confirmdialog/confirmdialogdemo.html b/showcase/demo/confirmdialog/confirmdialogdemo.html
@@ -74,6 +74,12 @@ <h3>Getting Started</h3>
                             <td>null</td>
                             <td>Message of the confirmation.</td>
                         </tr>
+                        <tr>
+                            <td>key</td>
+                            <td>string</td>
+                            <td>null</td>
+                            <td>Optional key to match the key of the confirm dialog, necessary to use when component tree has multiple confirm dialogs.</td>
+                        </tr>
                         <tr>
                             <td>header</td>
                             <td>string</td>
@@ -138,13 +144,19 @@ <h3>Attributes</h3>
                             <td>string</td>
                             <td>null</td>
                             <td>Title text of the dialog.</td>
-                        </tr>
+                         </tr>
                          <tr>
                            <td>message</td>
                            <td>string</td>
                            <td>null</td>
                            <td>Message of the confirmation.</td>
                         </tr>
+                        <tr>
+                            <td>key</td>
+                            <td>string</td>
+                            <td>null</td>
+                            <td>Optional key to match the key of confirm object, necessary to use when component tree has multiple confirm dialogs.</td>
+                        </tr>
                         <tr>
                           <td>icon</td>
                           <td>string</td>