Changeset 8232 for branches/2.5/contactcenter

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

Location:

branches/2.5/contactcenter

Files:

• js/cc.js (modified) (3 diffs)
• setup/default_records.inc.php (modified) (1 diff)
• setup/setup.inc.php (modified) (2 diffs)
• setup/tables_update.inc.php (modified) (1 diff)

branches/2.5/contactcenter/js/cc.js

@@ -1250 +1250 @@
                 states.disabled = false;
                 var i = 1;
+                /*
                 for (var j in data['data'])
                 {
@@ -1255 +1256 @@
                         if(i == 1) data['data'] = data['data'].sort();
                         i++;
-                }
-
+                }*/
+                jQuery.each(data['data'],function(index,value){
+                        if (value != undefined){
+                                states.options[i] = new Option(value, index);
+                                if(i == 1) data['data'] = data['data'].sort();
+                                i++;
+                        }                       
+                });
                 states.disabled = false;
                 states.selectedIndex = 0;
@@ -1366 +1373 @@
                 cities.disabled = false;
                 var i = 1;
+                /*
                 for (var j in data['data'])
                 {
                         cities.options[i] = new Option(data['data'][j], j);
                         i++;
-                }
-
+                }*/
+                jQuery.each(data['data'],function(index,value){
+                        if (value != undefined){
+                                cities.options[i] = new Option(value,index);
+                                i++;
+                        }
+                });
                 cities.disabled = false;
                 cities.selectedIndex = 0;

branches/2.5/contactcenter/setup/default_records.inc.php

@@ -19 +19 @@
         $oProc->query("insert into phpgw_cc_typeof_ct_addrs (id_typeof_contact_address,contact_address_type_name) values(1,'Comercial')");      
         $oProc->query("insert into phpgw_cc_typeof_ct_addrs (id_typeof_contact_address,contact_address_type_name) values(2,'Residencial')");
-
+  $oProc->query("ALTER TABLE phpgw_cc_groups SET WITH OIDS;");
         // Populate brazilian database.
         include("states_pt-br.inc.php"); 

branches/2.5/contactcenter/setup/setup.inc.php

@@ -17 +17 @@
         $setup_info['contactcenter']['name']      = 'contactcenter';
         $setup_info['contactcenter']['title']     = 'ContactCenter';
-        $setup_info['contactcenter']['version']   = '2.5.0';
+        $setup_info['contactcenter']['version']   = '2.5.1';
         $setup_info['contactcenter']['app_order'] = 4;
         $setup_info['contactcenter']['enable']    = 1;
@@ -77 +77 @@
         $setup_info['contactcenter']['depends'][] = array(
                 'appname' => 'phpgwapi',
-                'versions' => Array('2.5.0')
+                'versions' => Array('2.5.1.1')
         );
 ?>

branches/2.5/contactcenter/setup/tables_update.inc.php

@@ -100 +100 @@
         }
         $test[] = '2.4.2';
-        function contactcenter_upgrade2_4_2() {
-                $GLOBALS['setup_info']['contactcenter']['currentver'] = '2.5.0';
-                return $GLOBALS['setup_info']['contactcenter']['currentver'];
-        }
+    function contactcenter_upgrade2_4_2() {
+        $GLOBALS['setup_info']['contactcenter']['currentver'] = '2.5.0';
+        return $GLOBALS['setup_info']['contactcenter']['currentver'];
+    }
+
+    $test[] = '2.5.0';
+    function contactcenter_upgrade2_5_0() {
+        $GLOBALS['setup_info']['contactcenter']['currentver'] = '2.5.1';
+        return $GLOBALS['setup_info']['contactcenter']['currentver'];
+    }
 ?>