DataObjects/Core_watch.php

[Pman.Core] / Pman.Dialog.CoreEmail.js

diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js
index 670b9dc..73b01c7 100644 (file)
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -315,9 +315,7 @@ Pman.Dialog.CoreEmail = {
                                                     if(_this.data.id*1 > 0){
                                                         _this.dialog.el.mask("Loading");
                                                         this.load({ method: 'GET', params: { '_id' : _this.data.id }});
-                                                        if(_this.data.module == 'crm'){
-                                                            _this.html_preview.show();
-                                                        }
+                                                        _this.html_preview.show();
                                                         _this.preview_btn.show();
                                                         
                                                     } else {
@@ -360,7 +358,7 @@ Pman.Dialog.CoreEmail = {
                                             
                                             var s = Roo.get(_this.form.findField('bodytext').doc.documentElement);
                                             
-                                            var ontable = (_this.data.module) ? _this.data.module + '_mailing_list_message' : 'crm_mailing_list_message';
+                                            var ontable = (_this.data.module) ? _this.data.module : 'crm_mailing_list_message';
                                             
                                             var nodes = [];
                                             s.select('img[src]').each(function(i) {
@@ -1088,11 +1086,12 @@ Pman.Dialog.CoreEmail = {
                             }
                            
                             new Pman.Request({
-                                url : baseURL + '/Crm/MessagePreview',
+                                url : baseURL + '/Core/MessagePreview',
                                 method : 'POST',
                                 mask: 'Sending',
                                 params : {
-                                    _id : id
+                                    _id : id,
+                                    _table : _this.data.module
                                 }, 
                                 success : function(res) { 
                                     if(res.data == 'SUCCESS'){