Просмотр исходного кода

Updaty systemu do instalatora widok KONTAKTY etc

a.binder 11 лет назад
Родитель
Сommit
66564496d0
2 измененных файлов с 26 добавлено и 5 удалено
  1. 8 0
      SE/superedit-DB_PROCEDURES_CREATE.php
  2. 18 5
      SE/superedit-SQIX_STRUCTURE_DB_SYNC.php

+ 8 - 0
SE/superedit-DB_PROCEDURES_CREATE.php

@@ -46,6 +46,14 @@ DEBUG_S(-3,"Deklaruje zmienna SQL do wykonania instalacji procedur",null,__FILE_
 
 $sql['turn_off_database_locking']="SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED ;";
 
+
+
+
+$sql['KONTAKTY_view']="
+CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `KONTAKTY_view` AS select `u`.`ID` AS `ID`,`u`.`ADM_ACCOUNT` AS `ADM_ACCOUNT`,`u`.`ADM_NAME` AS `ADM_NAME`,`u`.`EMPLOYEE_TYPE` AS `EMPLOYEE_TYPE`,`u`.`ADM_PHONE` AS `ADM_PHONE`,`u`.`EMAIL` AS `EMAIL`,`u`.`A_STATUS` AS `A_STATUS`,`u`.`A_CLASSIFIED` AS `A_CLASSIFIED`,`u`.`A_ADM_COMPANY` AS `A_ADM_COMPANY`,group_concat(`ua`.`ID_ZASOB` separator ',') AS `ID_ZASOB_CSV_NUM` from (`ADMIN_USERS` `u` left join `CRM_AUTH_PROFILE` `ua` on(((`ua`.`REMOTE_ID` = `u`.`ID`) and (`ua`.`REMOTE_TABLE` = 'ADMIN_USERS')))) where (`u`.`A_STATUS` in ('WAITING','NORMAL','MONITOR','WARNING')) group by `u`.`ID`;
+";
+
+
 //! CRM_ZASOBY_BEGIN
 $sql['drop_CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path']="drop function if exists CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path";
 $sql['create_CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path']="CREATE DEFINER=`root`@`localhost` FUNCTION `CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path`(`delimiter` TEXT, `node` INT) RETURNS text CHARSET latin2

+ 18 - 5
SE/superedit-SQIX_STRUCTURE_DB_SYNC.php

@@ -702,17 +702,30 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
 							
 							$zas_id_param_out_repl=explode('&ZASOB_ID=', $h->DESC);
 							$zas_id_param_out_repl=explode('#', $zas_id_param_out_repl[1]);
+							$id_zas_oryg_h_DESC=$h->DESC; //oryginalna wartosc opisu
+							
+							
+							$zas_id_param_out_repl_2=explode('&ZASOB_ID=', $h->DESC);
+							$zas_id_param_out_repl_2=explode('&', $zas_id_param_out_repl_2[1]);
 							
 							$sql_to_find_parent="select DST_TABLE_ID from CRM_IMPORT_TRANSLATE where REM_TABLE='CRM_LISTA_ZASOBOW' and SRC_TABLE_ID='".$zas_id_param_out_repl[0]."' ;" ;
 							$res_to_find_parent_param=$CONNREMOTE->query($sql_to_find_parent) or DEBUG_S(-3,'Problem ze sql ',$sql_to_find_parent,__FILE__, __FUNCTION__, __LINE__) or die1(''); 
+							//proba 1 dla warunku ID_ZASOB=xxx#
 							while($h_res_to_find_TS=mysql_fetch_object($res_to_find_parent_param)) {
-
-								$h->DESC=preg_replace('/&ZASOB_ID='.$zas_id_param_out_repl[0].'#/', '&ZASOB_ID='.$h_res_to_find_TS->DST_TABLE_ID.'#', $h->DESC);
-								$sql_upd="update CRM_LISTA_ZASOBOW set `DESC`='".$CONNREMOTE->_($h->DESC)."' where ID=".$h->ID." ; ";
+								$h->DESC=preg_replace('/&ZASOB_ID='.$zas_id_param_out_repl[0].'#/', '&ZASOB_ID='.$h_res_to_find_TS->DST_TABLE_ID.'#', $id_zas_oryg_h_DESC);
+								if(strlen($h->DESC)>0) { $sql_upd="update CRM_LISTA_ZASOBOW set `DESC`='".$CONNREMOTE->_($h->DESC)."' where ID=".$h->ID." ; ";
 								$CONNREMOTE->query($sql_upd) or die('Error with upd TYPESPECIAL PARAM_OUT line: 709 ');
-								DEBUG_S(-3,'Nadpisuje TYPESPECIAL PARAM_OUT, ktory ma uzyty URL z ID_ZASOB',$sql_upd,__FILE__,__FUNCTION__,__LINE__);
+								DEBUG_S(-3,'Nadpisuje TYPESPECIAL PARAM_OUT, ktory ma uzyty URL z ID_ZASOB',$sql_upd,__FILE__,__FUNCTION__,__LINE__);								
 							}
-							
+							//proba 2 dla warunku ID_ZASOB=xxx&
+							$res_to_find_parent_param=$CONNREMOTE->query($sql_to_find_parent) or DEBUG_S(-3,'Problem ze sql ',$sql_to_find_parent,__FILE__, __FUNCTION__, __LINE__) or die1(''); 
+							//proba 1 dla warunku ID_ZASOB=xxx#
+							while($h_res_to_find_TS=mysql_fetch_object($res_to_find_parent_param)) {
+								$h->DESC=preg_replace('/&ZASOB_ID='.$zas_id_param_out_repl_2[0].'&/', '&ZASOB_ID='.$h_res_to_find_TS->DST_TABLE_ID.'&', $id_zas_oryg_h_DESC);
+								if(strlen($h->DESC)>0) { $sql_upd="update CRM_LISTA_ZASOBOW set `DESC`='".$CONNREMOTE->_($h->DESC)."' where ID=".$h->ID." ; ";
+								$CONNREMOTE->query($sql_upd) or die('Error with upd TYPESPECIAL PARAM_OUT line: 709 ');
+								DEBUG_S(-3,'Nadpisuje TYPESPECIAL PARAM_OUT, ktory ma uzyty URL z ID_ZASOB',$sql_upd,__FILE__,__FUNCTION__,__LINE__);								
+							}							
 							
 						}