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

SE/superedit-ANALIZA_HISTORII_ALL.php

@@ -6,12 +6,12 @@ function ANALIZA_HISTORII_ALL() {
 	SE_Layout::menu();
 
 	$_GET['F_LIMIT'] = V::get('F_LIMIT', 1, $_GET, 'int');
-	$_GET['TABLES_LIKE'] = V::get('TABLES_LIKE', '', $_GET);
+	$_GET['TABLES_LIKE'] = V::get('TABLES_LIKE', '%', $_GET);
 	$_GET['A_RECORD_UPDATE_DATE']  = V::get('A_RECORD_UPDATE_DATE', '', $_GET);
 	$_GET['A_RECORD_UPDATE_DATE2'] = V::get('A_RECORD_UPDATE_DATE2', 'x', $_GET);
 	$_GET['A_RECORD_UPDATE_AUTHOR']  = V::get('A_RECORD_UPDATE_AUTHOR', '%', $_GET);
 	$_GET['A_RECORD_UPDATE_AUTHOR2'] = V::get('A_RECORD_UPDATE_AUTHOR2', 'x', $_GET);
-	$REBUILD_ANALIZA_HISTORII_ALL_TABLE = V::get('REBUILD_ANALIZA_HISTORII_ALL_TABLE', '', $_GET);
+	$REBUILD_ANALIZA_HISTORII_ALL_TABLE = V::get('REBUILD_ANALIZA_HISTORII_ALL_TABLE', '%', $_GET);
 	
 	
 	$__install = V::get('__install', '', $_GET);

SE/superedit-DB_PROCEDURES_CREATE.php

@@ -164,7 +164,7 @@ $sql['event_create_CRM_LISTA_ZASOBOW__CRM_WSKAZNIK_tree']="CREATE DEFINER=root@l
      BEGIN
      	update  CRM_LISTA_ZASOBOW set path=CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/',ID);
      	update  CRM_WSKAZNIK set path_CRM_LISTA_ZASOBOW=CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/',ID_ZASOB);
-
+	  	update  CRM_PROCES set path=CRM_PROCES_hierarchy_sys_connect_by_path('-',ID);
      END
 
      ";
@@ -261,10 +261,6 @@ BEGIN
          WHERE   id = _id
                     AND COALESCE(id <> @start_with, TRUE);
                SET _path = CONCAT(_id, delimiter, _path);
-
-
-
-
   END LOOP;
 END";
 
@@ -287,8 +283,6 @@ BEGIN
          FROM    CRM_PROCES
          WHERE   id = _id
                     AND COALESCE(id <> @start_with, TRUE);
-
-
                if _type = 'PROCES_INIT' THEN
                 SET _path = _id_cur;
                END IF;
@@ -338,6 +332,89 @@ $sql['alter__CRM_PROCES_STATS_proc_wiev_modify_treeitem']="alter table _CRM_PROC
 
 
 
+//! CRM_PROCES path begin @2016-10
+
+
+
+//! CRM_ZASOBY_BEGIN
+$sql['drop_CRM_PROCES_hierarchy_sys_connect_by_path']="drop function if exists CRM_PROCES_hierarchy_sys_connect_by_path";
+$sql['create_CRM_PROCES_hierarchy_sys_connect_by_path']="CREATE DEFINER=`root`@`localhost` FUNCTION `CRM_PROCES_hierarchy_sys_connect_by_path`(`delimiter` TEXT, `node` INT) RETURNS text CHARSET latin2
+    READS SQL DATA
+BEGIN
+     DECLARE _path TEXT;
+     DECLARE _type CHAR(255);
+     DECLARE _lvl INT;
+
+ DECLARE _cpath TEXT;
+        DECLARE _id INT;
+        DECLARE _id_cur INT;
+    DECLARE EXIT HANDLER FOR NOT FOUND RETURN _path;
+    SET _id = COALESCE(node, @id);
+      SET _path = '';
+      SET _lvl=1;
+    the_loop: LOOP
+
+     SET _lvl =_lvl+1;
+
+       IF _lvl>100 THEN
+       	 RETURN concat('ERROR',_path);
+	     LEAVE the_loop;
+
+       END IF;
+
+                SELECT  PARENT_ID,`DESC`,ID
+              INTO    _id,_type,_id_cur
+         FROM    CRM_PROCES
+         WHERE   id = _id
+                    AND COALESCE(id <> @start_with, TRUE);
+               SET _path = CONCAT(_id_cur, delimiter, _path);
+  END LOOP the_loop;
+END";
+
+
+
+//!_CRM_LISTA_ZASOBOW_tree_UPDATE
+$sql['drop__CRM_PROCES_tree_UPDATE']="DROP TRIGGER IF EXISTS  `_CRM_PROCES_tree_UPDATE`";
+$sql['create__CRM_PROCES_tree_UPDATE']="CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_PROCES_tree_UPDATE` BEFORE UPDATE ON `CRM_PROCES` FOR EACH ROW BEGIN
+IF NEW.PARENT_ID<>OLD.PARENT_ID THEN
+SET NEW.path = CRM_PROCES_hierarchy_sys_connect_by_path('/', NEW.PARENT_ID);
+END IF;
+END
+";
+
+//!_CRM_LISTA_ZASOBOW_tree_UPDATE_after
+//$sql['drop__CRM_PROCES_tree_UPDATE_after']="DROP TRIGGER IF EXISTS  `_CRM_PROCES_tree_UPDATE_after`";
+/*$sql['create__CRM_LISTA_ZASOBOW_tree_UPDATE_after']="CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_LISTA_ZASOBOW_tree_UPDATE_after` AFTER UPDATE ON `CRM_LISTA_ZASOBOW` FOR EACH ROW BEGIN
+IF NEW.PARENT_ID<>OLD.PARENT_ID or NEW.`DESC`<>OLD.`DESC` THEN
+-- update CRM_LISTA_ZASOBOW ik set ik.path=CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/', ik.ID) where path like concat('%',OLD.`DESC`,'%');
+update CRM_WSKAZNIK ik set ik.path_CRM_LISTA_ZASOBOW=CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/', ik.ID_ZASOB) where path_CRM_LISTA_ZASOBOW like concat('%',OLD.`DESC`,'%');
+END IF;
+
+END
+";
+*/
+
+
+//!_CRM_LISTA_ZASOBOW_tree_INSERT
+$sql['drop__CRM_PROCES_tree_INSERT']="DROP TRIGGER IF EXISTS  `_CRM_PROCES_tree_INSERT`";
+$sql['create__CRM_PROCES_tree_INSERT']="CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_PROCES_tree_INSERT` BEFORE INSERT ON `CRM_PROCES` FOR EACH ROW BEGIN
+
+	SET NEW.path = CRM_PROCES_hierarchy_sys_connect_by_path('/', NEW.PARENT_ID);
+END
+";
+
+
+
+
+//! CRM_PROCES path end @2016-10
+
+
+
+
+
+
+
+
 
 
 //!_CRM_PROCES_STATS_proc_wiev_UPDATE

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1454,6 +1454,10 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/.config.php','/Library/Server/Web/Data/Sites/Default/SE/');
     $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/procesy || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/procesy','/Library/Server/Web/Data/Sites/Default/SE/');
+ 
+  $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/static || echo PASSED';
+  $cmd[]['scp_root']=array($INSTALL_ROOT.'/static','/Library/Server/Web/Data/Sites/Default/SE/');
+ 
     $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/bash_sync_perms.php || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_sync_perms.php','/Library/Server/Web/Data/Sites/Default/SE/');
 	$cmd[]['rsh']='rm /Library/Server/Web/Data/Sites/Default/SE/bash_install_check.php || echo PASSED';