X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEmail.bjs;h=3dd0bd6c9278b548a5b924b2de322bfab5df9bf7;hp=f6ffefb930ece2c35ecceb3a71faafe33b942abb;hb=8cd2a9237c684aa16bc21e3ac6d3793c49c65400;hpb=b361589e5ebebedf4f981f58663c3b27eefb04b9

diff --git a/Pman.Dialog.CoreEmail.bjs b/Pman.Dialog.CoreEmail.bjs
index f6ffefb9..3dd0bd6c 100644
--- a/Pman.Dialog.CoreEmail.bjs
+++ b/Pman.Dialog.CoreEmail.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.CoreEmail",
  "parent" : "",
  "title" : "",
- "path" : "/home/alan/gitlive/Pman.Core/Pman.Dialog.CoreEmail.bjs",
+ "path" : "/home/johns/gitlive/Pman.Core/Pman.Dialog.CoreEmail.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -313,7 +313,7 @@
                "pageSize" : 25,
                "displayField" : "name",
                "emptyText" : "Select BCC Group",
-               "hiddenName" : "bcc_group",
+               "hiddenName" : "bcc_group_id",
                "minChars" : 2,
                "valueField" : "id",
                "xtype" : "ComboBox",
@@ -322,7 +322,7 @@
                "editable" : false,
                "width" : 300,
                "$ xns" : "Roo.form",
-               "name" : "bcc_group_name",
+               "name" : "bcc_group_id_name",
                "qtip" : "Select BCC Group",
                "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>",
                "loadingText" : "Searching...",
@@ -339,7 +339,7 @@
                  "* prop" : "store",
                  "items" : [
                   {
-                   "$ url" : "baseURL + '/Roo/Groups'",
+                   "$ url" : "baseURL + '/Roo/Core_group'",
                    "method" : "GET",
                    "xtype" : "HttpProxy",
                    "$ xns" : "Roo.data",
@@ -526,7 +526,7 @@
              "items" : [
               {
                "listeners" : {
-                "click" : "function (_self, e)\n{\n    var h = _this.form.findField('bodytext').getValue();\n    var p = _this.form.findField('plaintext');\n    \n    new Pman.Request({\r\n        url : baseURL + '/Core/ImportMailMessage.php',\r\n        method : 'POST',\r\n        params : {\n          bodytext : h,\r\n          _convertToPlain : true,\n          _check_unsubscribe : true\r\n        }, \r\n        success : function(res) {\r\n            if(res.success == true){\n               p.setValue(res.data);\n            }\r\n        }\r\n    });  \n    \n}"
+                "click" : "function (_self, e)\n{\n    var h = _this.form.findField('bodytext').getValue();\n    var p = _this.form.findField('plaintext');\n    \n    new Pman.Request({\r\n        url : baseURL + '/Core/ImportMailMessage.php',\r\n        method : 'POST',\r\n        params : {\n          bodytext : h,\r\n          _convertToPlain : true,\n          _check_unsubscribe : true\r\n        }, \r\n        success : function(res) {\r\n            if(res.success == true){\n               p.setValue(res.data);\n            }\r\n        }\r\n    });\n    \n}"
                },
                "text" : "Convert Html to Text",
                "xtype" : "Button",
@@ -643,7 +643,7 @@
          "items" : [
           {
            "listeners" : {
-            "|click" : "function()\n{\n    var id = _this.form.findField('id').getValue();\n    \n    if(id*1 < 1){\n        Roo.MessageBox.alert('Error', 'Please save the email template first');\n        return;\n    }\n    \n    var ontable = (_this.data.module) ? _this.data.module : 'crm_mailing_list_message';\n    \n    Pman.Dialog.Image.show( { id : 0, onid: id, ontable: ontable }, function() {\n        _this.igrid.getDataSource().load({});\n    }); \n}\n"
+            "|click" : "function()\n{\n    var id = _this.form.findField('id').getValue();\n    \n    if(id*1 < 1){\n        Roo.MessageBox.alert('Error', 'Please save the email template first');\n        return;\n    }\n    \n    var ontable = (_this.data.module) ? _this.data.module : 'crm_mailing_list_message';\n    \n    Pman.Dialog.Image.show( { id : 0, onid: id, ontable: ontable }, function() {\n        _this.igrid.getDataSource().load({});\n    });\n}\n"
            },
            "text" : "Add",
            "xtype" : "Button",
@@ -707,7 +707,7 @@
     {
      "listeners" : {
       "render" : "function (_self)\n{\n    _this.html_preview = _self;\n}",
-      "click" : "function (_self, e)\n{\n    //_this.dialog.hide();\n    \n    var id = _this.form.findField('id').getValue();\n    \n    if(id*1 < 1){\n        Roo.MessageBox.alert('Error', 'Please save the message frist!');\n        return;\n    }\n   \n    new Pman.Request({\n        url : baseURL + '/Core/MessagePreview',\n        method : 'POST',\n        mask: 'Sending',\n        params : {\n            _id : id,\n            _table : _this.data.module\n        }, \n        success : function(res) { \n            if(res.data == 'SUCCESS'){\n                Roo.MessageBox.alert(\"Email Sent\", 'The report was sent to your email (HTML format).');\n            }\n        }\n    });\n}"
+      "click" : "function (_self, e)\n{\n    //_this.dialog.hide();\n\n    var id = _this.form.findField('id').getValue();\n    \n    if(id*1 < 1){\n        Roo.MessageBox.alert('Error', 'Please save the message frist!');\n        return;\n    }\n   \n    new Pman.Request({\n        url : baseURL + '/Core/MessagePreview',\n        method : 'POST',\n        mask: 'Sending',\n        params : {\n            _id : id,\n            _table : _this.data.module\n        }, \n        success : function(res) { \n            if(res.data == 'SUCCESS'){\n                Roo.MessageBox.alert(\"Email Sent\", 'The report was sent to your email (HTML format).');\n            }\n        }\n    });\n}"
      },
      "text" : "Send me a test copy",
      "xtype" : "Button",