Merge branch 'master' of http://git.roojs.com/Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 46ef4b3..54beefe 100644 (file)
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -458,7 +458,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     {
         $affects  = array();
         
-        $all_links = $x->databaseLinks();
+        $all_links = $this->databaseLinks();
         
         foreach($all_links as $tbl => $links) {
             foreach($links as $col => $totbl_col) {

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index a8f4757..be53672 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -1240,6 +1240,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         $c->find(true);
         $this->company_id = $c->id;
+        $this->email = trim($this->email);
         
     }
     
@@ -1466,6 +1467,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                 }
             }
         }
+        $this->email = trim($this->email);
     }
     
     function generateOathKey()

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 03d79e9..85b8846 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -2,17 +2,25 @@
  "name" : "Pman.Dialog.CoreEnumMerge",
  "parent" : "",
  "title" : "",
- "path" : "/home/benny/gitlive/web.hhyc_membership_system/Pman/Core/Pman.Dialog.CoreEnumMerge.bjs",
+ "path" : "/home/alan/gitlive/Pman.Core/Pman.Dialog.CoreEnumMerge.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
-  "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
+  "8324cdec05065c4bd7d8c5effdf43edf" : "Delete this",
   "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
-  "03e956f1dca2b4d525df03cb1899cb6f" : "Merge with",
+  "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "68be4837f6c739877233e527a996dd00" : "Merge",
+  "266459bee8ed1ca2e0464899e1ef0994" : "And replace with",
   "ea4788705e6873b424c65e91c2846b19" : "Cancel"
  },
+ "named_strings" : {
+  "display_name_fieldLabel" : "8324cdec05065c4bd7d8c5effdf43edf",
+  "_merge_id_name_emptyText" : "bf8691517ce00a09186a05cd65863091",
+  "_merge_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+  "_merge_id_name_qtip" : "bf8691517ce00a09186a05cd65863091",
+  "_merge_id_name_fieldLabel" : "266459bee8ed1ca2e0464899e1ef0994"
+ },
  "items" : [
   {
    "listeners" : {
@@ -22,11 +30,11 @@
    "collapsible" : false,
    "title" : "Merge Pulldown Option",
    "xtype" : "LayoutDialog",
-   "width" : 400,
+   "width" : 450,
    "$ xns" : "Roo",
    "closable" : false,
    "resizable" : false,
-   "height" : 120,
+   "height" : 160,
    "items" : [
     {
      "xtype" : "LayoutRegion",
@@ -41,20 +49,29 @@
       {
        "listeners" : {
         "actionfailed" : "function (_self, action)\n{\n \n    Pman.standardActionFailed(_self, action);\n}\n",
-        "rendered" : "function (form)\n{\n   _this.form = form;\n}",
-        "actioncomplete" : "function (_self, action)\n{\n\n   if (action.type =='submit') {\n       \n         _this.dialog.hide();\n       \n        if (_this.callback) {\n           _this.callback.call(_this, _this.form.getValues());\n        }\n        _this.form.reset();\n        return;\n    }\n    if (action.type == 'setdata') {\n        \n         var title = _this.data.title  || _this.data.etype;\n        _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n         \n       return;\n    }\n    \n}\n"
+        "actioncomplete" : "function (_self, action)\n{\n\n   if (action.type =='submit') {\n       \n         _this.dialog.hide();\n       \n        if (_this.callback) {\n           _this.callback.call(_this, _this.form.getValues());\n        }\n        _this.form.reset();\n        return;\n    }\n    if (action.type == 'setdata') {\n        \n         var title = _this.data.title  || _this.data.etype;\n        _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n         this.load({ method: 'GET', params: { '_id' : _this.data.id }});  \n        return;\n    }\n    \n}\n",
+        "rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
        "$ url" : "baseURL + '/Roo/Core_enum.php'",
-       "xtype" : "Form",
        "method" : "POST",
+       "xtype" : "Form",
        "style" : "margin: 10px;",
        "$ xns" : "Roo.form",
+       "Number labelWidth" : 120,
        "items" : [
+        {
+         "String name" : "display_name",
+         "Number width" : 250,
+         "Boolean readOnly" : true,
+         "xtype" : "TextField",
+         "String fieldLabel" : "Delete this",
+         "$ xns" : "Roo.form"
+        },
         {
          "alwaysQuery" : true,
          "listWidth" : 400,
          "triggerAction" : "all",
-         "fieldLabel" : "Merge with",
+         "fieldLabel" : "And replace with",
          "forceSelection" : true,
          "selectOnFocus" : true,
          "pageSize" : 20,
@@ -86,8 +103,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Roo/Core_enum'",
-             "method" : "GET",
              "xtype" : "HttpProxy",
+             "method" : "GET",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 18d008e..b22b89f 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -7,18 +7,20 @@ Roo.namespace('Pman.Dialog');
 Pman.Dialog.CoreEnumMerge = {
 
  _strings : {
-  'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
+  '8324cdec05065c4bd7d8c5effdf43edf' :"Delete this",
   '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
-  '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
+  'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
+  '266459bee8ed1ca2e0464899e1ef0994' :"And replace with",
   'ea4788705e6873b424c65e91c2846b19' :"Cancel"
  },
  _named_strings : {
+  'display_name_fieldLabel' : '8324cdec05065c4bd7d8c5effdf43edf' /* Delete this */ ,
   '_merge_id_name_emptyText' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
   '_merge_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
   '_merge_id_name_qtip' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
-  '_merge_id_name_fieldLabel' : '03e956f1dca2b4d525df03cb1899cb6f' /* Merge with */ 
+  '_merge_id_name_fieldLabel' : '266459bee8ed1ca2e0464899e1ef0994' /* And replace with */ 
  },
 
  dialog : false,
@@ -48,11 +50,11 @@ Pman.Dialog.CoreEnumMerge = {
     xtype : 'LayoutDialog',
     closable : false,
     collapsible : false,
-    height : 120,
+    height : 160,
     modal : true,
     resizable : false,
     title : _this._strings['298a183cfe4fddedd4bd17abe8aeb685'] /* Merge Pulldown Option */,
-    width : 400,
+    width : 450,
     listeners : {
      show : function (_self)
       {
@@ -105,6 +107,7 @@ Pman.Dialog.CoreEnumMerge = {
       items  : [
        {
         xtype : 'Form',
+        labelWidth : 120,
         method : 'POST',
         style : 'margin: 10px;',
         url : baseURL + '/Roo/Core_enum.php',
@@ -126,8 +129,8 @@ Pman.Dialog.CoreEnumMerge = {
                   
                    var title = _this.data.title  || _this.data.etype;
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
-                   
-                 return;
+                   this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
+                  return;
               }
               
           },
@@ -144,13 +147,22 @@ Pman.Dialog.CoreEnumMerge = {
         xns : Roo.form,
         '|xns' : 'Roo.form',
         items  : [
+         {
+          xtype : 'TextField',
+          fieldLabel : _this._strings['8324cdec05065c4bd7d8c5effdf43edf'] /* Delete this */,
+          name : 'display_name',
+          readOnly : true,
+          width : 250,
+          xns : Roo.form,
+          '|xns' : 'Roo.form'
+         },
          {
           xtype : 'ComboBox',
           allowBlank : false,
           alwaysQuery : true,
           displayField : 'name',
           emptyText : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
-          fieldLabel : _this._strings['03e956f1dca2b4d525df03cb1899cb6f'] /* Merge with */,
+          fieldLabel : _this._strings['266459bee8ed1ca2e0464899e1ef0994'] /* And replace with */,
           forceSelection : true,
           hiddenName : '_merge_id',
           listWidth : 400,