DataObjects/core.sql

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

diff --git a/Pman.Dialog.CoreMailingListMessage.js b/Pman.Dialog.CoreMailingListMessage.js
index b9728ae..c39c5bc 100644 (file)
--- a/Pman.Dialog.CoreMailingListMessage.js
+++ b/Pman.Dialog.CoreMailingListMessage.js
@@ -167,12 +167,15 @@ Pman.Dialog.CoreMailingListMessage = {
                                 listeners : {
                                     select : function (combo, record, index)
                                     {
-                                        Roo.log(record);
+                                       
                                     /*
                                         (function() { 
                                             combo.setValue('');
                                         }).defer(100);
                                     */    
+                                        if(!record){
+                                            return;
+                                        }
                                         _this.form.findField('bodytext').setValue(record.data.content);
                                     
                                     }
@@ -312,8 +315,9 @@ Pman.Dialog.CoreMailingListMessage = {
                                                     if(_this.data.id*1 > 0){
                                                         _this.dialog.el.mask("Loading");
                                                         this.load({ method: 'GET', params: { '_id' : _this.data.id }});
-                                            
-                                                        _this.html_preview.show();
+                                                        if(_this.data.module == 'crm'){
+                                                            _this.html_preview.show();
+                                                        }
                                                         _this.preview_btn.show();
                                                         
                                                     } else {
@@ -1084,12 +1088,11 @@ Pman.Dialog.CoreMailingListMessage = {
                             }
                            
                             new Pman.Request({
-                                url : baseURL + '/Core/MessagePreview',
+                                url : baseURL + '/Crm/MessagePreview',
                                 method : 'POST',
                                 mask: 'Sending',
                                 params : {
-                                    _id : id,
-                                    _ontable : (_this.data.module) ? _this.data.module + '_mailing_list_message' : 'core_mailing_list_message'
+                                    _id : id
                                 }, 
                                 success : function(res) { 
                                     if(res.data == 'SUCCESS'){