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

Merge branch 'master' of biuro.biall-net.pl:plabudda/se

a.binder 11 лет назад
Родитель
Сommit
c999fe59e6
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      SE/se-lib/Data_Source.php
  2. 2 1
      SE/superedit-DB_PROCEDURES_CREATE.php

+ 1 - 1
SE/se-lib/Data_Source.php

@@ -785,7 +785,7 @@ if(V::get('DBG_DS', 0, $_GET) > 2){echo'<pre style="max-height:200px;overflow:au
 		$itemPatch = (object)$itemPatch;
 		$affected = $this->_db->UPDATE_OBJ($this->_tbl, $itemPatch);
 		if ($affected < 0) {
-			$dsErrors = $ds->getDbErrors();
+			$dsErrors = $this->getDbErrors();
 			$dsErrors = "Wystąpiły błędy!\n" . implode("\n", $dsErrors);
 			throw new Exception($dsErrors);
 		}

+ 2 - 1
SE/superedit-DB_PROCEDURES_CREATE.php

@@ -591,7 +591,8 @@ $sql['drop__CRM_PROCES_GOTO_CACHE']="drop table if exists _CRM_PROCES_GOTO_CACHE
 $sql_tmp['select_CRM_PROCES_GOTO_CACHE']="select t1.ID,t1.ID_PROCES_INIT,t2.IF_TRUE_GOTO , t2.IF_TRUE_GOTO_FLAG, now() as TIMESTAMP
 	 from _CRM_PROCES_STATS_proc_wiev t1 
 	inner join CRM_PROCES as t2 on ( t1.ID=t2.ID and t2.IF_TRUE_GOTO>0 and t2.IF_TRUE_GOTO_FLAG='GOTO_AND_RETURN' ) 
-	-- inner join CRM_PROCES as t3 on ( t2.IF_TRUE_GOTO=t3.ID and t2.IF_TRUE_GOTO>0 and t2.IF_TRUE_GOTO_FLAG='GOTO_AND_RETURN' )  TODO@2014-09-04 trzeba rekursywnie podlapac wzajemne powiazania
+	 inner join CRM_PROCES as t3 on ( t2.IF_TRUE_GOTO=t3.ID and t2.IF_TRUE_GOTO>0 and t2.IF_TRUE_GOTO_FLAG='GOTO_AND_RETURN' ) 
+	-- TODO@2014-09-04 trzeba rekursywnie podlapac wzajemne powiazania
 
 	where t1.ID_PROCES_INIT>0
 	";