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

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

# By Piotr Labudda
# Via Piotr Labudda
* 'master' of biuro.biall-net.pl:plabudda/se:
  TableAjaxMap: rename table for additional layer
  TableAjaxMap: hide form below map, remove cluster strategy for additional layer
  Map: fix handle resizable
  Map: fix resize dialog box
  TableAjax add resizable to Map widget at dock position
  TableAjax: fix resizable modal window and add draggable
  Fix create trigger definer bug
a.binder 10 лет назад
Родитель
Сommit
68057683b6

+ 2 - 2
SE/bash_sync_perms.php

@@ -232,7 +232,7 @@ class SyncPerms {
 		$sql = " DROP TRIGGER IF EXISTS `KORESP_change_ID_PROJECT`; ";
 		$db->query($sql);
 		$sql = "
-			CREATE TRIGGER `KORESP_change_ID_PROJECT` AFTER UPDATE ON `IN7_DZIENNIK_KORESP`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `KORESP_change_ID_PROJECT` AFTER UPDATE ON `IN7_DZIENNIK_KORESP`
 			 FOR EACH ROW BEGIN
 					IF (NEW.`ID_PROJECT` != OLD.`ID_PROJECT` and NEW.`ID_PROJECT` > 0) or OLD.`M_DIST_FILES`!=NEW.`M_DIST_FILES` THEN
 						update `_SYNC_FILE_PERMS` as s set
@@ -248,7 +248,7 @@ class SyncPerms {
 		$sql = " DROP TRIGGER IF EXISTS `KORESP_add_ID_PROJECT`; ";
 		$db->query($sql);
 		$sql = "
-			CREATE TRIGGER `KORESP_add_ID_PROJECT` AFTER INSERT ON `IN7_DZIENNIK_KORESP`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `KORESP_add_ID_PROJECT` AFTER INSERT ON `IN7_DZIENNIK_KORESP`
 			 FOR EACH ROW BEGIN
 					IF NEW.`ID_PROJECT` > 0 THEN
 						update `_SYNC_FILE_PERMS` as s set

+ 4 - 4
SE/se-lib/Route/FixCrmProcesInitIdx.php

@@ -646,7 +646,7 @@ END ;
 SQL;
 		$sqlList['RemoveTrigger_AfterInsertProces'] = "DROP TRIGGER IF EXISTS `FixCrmProcesInitIdx_CRM_PROCES_AFTER_INSERT`";
 		$sqlList['CreateTrigger_AfterInsertProces'] = "
-			CREATE TRIGGER `FixCrmProcesInitIdx_CRM_PROCES_AFTER_INSERT` AFTER INSERT ON `CRM_PROCES`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `FixCrmProcesInitIdx_CRM_PROCES_AFTER_INSERT` AFTER INSERT ON `CRM_PROCES`
 				FOR EACH ROW BEGIN
 					-- only when PARENT_ID changes and PARENT_ID exists in `CRM_PROCES_idx`
 					IF NEW.`PARENT_ID` IS NOT NULL AND NEW.`PARENT_ID`>0 AND (select count(*) from `CRM_PROCES_idx` where `ID_PROCES`=NEW.`PARENT_ID` limit 1)>0 THEN
@@ -675,7 +675,7 @@ SQL;
 		";
 		$sqlList['RemoveTrigger_AfterUpdateProces'] = "DROP TRIGGER IF EXISTS `FixCrmProcesInitIdx_CRM_PROCES_AFTER_UPDATE`";
 		$sqlList['CreateTrigger_AfterUpdateProces'] = "
-			CREATE TRIGGER `FixCrmProcesInitIdx_CRM_PROCES_AFTER_UPDATE` AFTER UPDATE ON `CRM_PROCES`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `FixCrmProcesInitIdx_CRM_PROCES_AFTER_UPDATE` AFTER UPDATE ON `CRM_PROCES`
 				FOR EACH ROW BEGIN
 					-- only when PARENT_ID changes and ID exists in `CRM_PROCES_idx`
 					IF NEW.`PARENT_ID`!=OLD.`PARENT_ID` AND (select count(*) from `CRM_PROCES_idx` where `ID_PROCES` in(NEW.`ID`, NEW.`PARENT_ID`, OLD.`PARENT_ID`) limit 1)>0 THEN
@@ -704,7 +704,7 @@ SQL;
 		";
 		$sqlList['RemoveTrigger_AfterInsertWskaznik'] = "DROP TRIGGER IF EXISTS `FixCrmProcesInitIdx_CRM_WSKAZNIK_AFTER_INSERT`";
 		$sqlList['CreateTrigger_AfterInsertWskaznik'] = "
-			CREATE TRIGGER `FixCrmProcesInitIdx_CRM_WSKAZNIK_AFTER_INSERT` AFTER INSERT ON `CRM_WSKAZNIK`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `FixCrmProcesInitIdx_CRM_WSKAZNIK_AFTER_INSERT` AFTER INSERT ON `CRM_WSKAZNIK`
 				FOR EACH ROW BEGIN
 					-- only when ID_PROCES exists in `CRM_PROCES_idx`
 					-- only when ID_ZASOB is group
@@ -741,7 +741,7 @@ SQL;
 		";
 		$sqlList['RemoveTrigger_AfterUpdateWskaznik'] = "DROP TRIGGER IF EXISTS `FixCrmProcesInitIdx_CRM_WSKAZNIK_AFTER_UPDATE`";
 		$sqlList['CreateTrigger_AfterUpdateWskaznik'] = "
-			CREATE TRIGGER `FixCrmProcesInitIdx_CRM_WSKAZNIK_AFTER_UPDATE` AFTER UPDATE ON `CRM_WSKAZNIK`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `FixCrmProcesInitIdx_CRM_WSKAZNIK_AFTER_UPDATE` AFTER UPDATE ON `CRM_WSKAZNIK`
 				FOR EACH ROW BEGIN
 					-- only when old or new ID_PROCES exists in `CRM_PROCES_idx`
 					-- only when old or new ID_ZASOB is group

+ 13 - 13
SE/se-lib/Route/FixProjectPath.php

@@ -186,7 +186,7 @@ jQuery(document).ready(function () {
 		";
 		$sqlList['RemoveTrigger_BeforeInsertProject'] = "DROP TRIGGER IF EXISTS `_IN7_MK_BAZA_DYSTRYBUCJI_tree_INSERT`";
 		$sqlList['CreateTrigger_BeforeInsertProject'] = "
-			CREATE TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_INSERT` BEFORE INSERT ON `IN7_MK_BAZA_DYSTRYBUCJI`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_INSERT` BEFORE INSERT ON `IN7_MK_BAZA_DYSTRYBUCJI`
 				FOR EACH ROW BEGIN
 					-- SET NEW.path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.P_ID);
 					SET NEW.path = (select CONCAT(
@@ -207,7 +207,7 @@ jQuery(document).ready(function () {
 		//  #1146 - Table '{DATABASE_NAME}.ERROR: Parent item not exists' doesn't exist
 		//  #1146 - Table '{DATABASE_NAME}.ERROR: Loop detected in path' doesn't exist
 		$sqlList['CreateTrigger_BeforeUpdateProject'] = "
-			CREATE TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_UPDATE` BEFORE UPDATE ON `IN7_MK_BAZA_DYSTRYBUCJI`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_UPDATE` BEFORE UPDATE ON `IN7_MK_BAZA_DYSTRYBUCJI`
 				FOR EACH ROW BEGIN
 					-- IF NEW.P_ID<>OLD.P_ID THEN
 					-- SET NEW.path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.P_ID);
@@ -274,7 +274,7 @@ jQuery(document).ready(function () {
 		// throws errors:
 		//  #1146 - Table '{DATABASE_NAME}.WARNING: Update all paths' doesn't exist
 		$sqlList['CreateTrigger_AfterUpdateProject'] = "
-			CREATE TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_AFTER_UPDATE` AFTER UPDATE ON `IN7_MK_BAZA_DYSTRYBUCJI`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_AFTER_UPDATE` AFTER UPDATE ON `IN7_MK_BAZA_DYSTRYBUCJI`
 				FOR EACH ROW BEGIN
 					IF NEW.`P_ID`!=OLD.`P_ID` THEN
 						-- throw warning to update all pathes in `IN7_MK_BAZA_DYSTRYBUCJI` with path under current?
@@ -304,7 +304,7 @@ jQuery(document).ready(function () {
 		";
 		$sqlList['RemoveTrigger_BeforeInsertKoresp'] = "DROP TRIGGER IF EXISTS `_IN7_DZIENNIK_KORESP_tree_INSERT`";
 		$sqlList['CreateTrigger_BeforeInsertKoresp'] = "
-			CREATE TRIGGER `_IN7_DZIENNIK_KORESP_tree_INSERT` BEFORE INSERT ON `IN7_DZIENNIK_KORESP`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_IN7_DZIENNIK_KORESP_tree_INSERT` BEFORE INSERT ON `IN7_DZIENNIK_KORESP`
 				FOR EACH ROW BEGIN
 					IF NEW.ID_PROJECT IS NOT NULL and NEW.ID_PROJECT>0 THEN
 						-- SET NEW.path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.ID_PROJECT);
@@ -316,7 +316,7 @@ jQuery(document).ready(function () {
 		";
 		$sqlList['RemoveTrigger_BeforeUpdateKoresp'] = "DROP TRIGGER IF EXISTS `_IN7_DZIENNIK_KORESP_tree_UPDATE`";
 		$sqlList['CreateTrigger_BeforeUpdateKoresp'] = "
-			CREATE TRIGGER `_IN7_DZIENNIK_KORESP_tree_UPDATE` BEFORE UPDATE ON `IN7_DZIENNIK_KORESP`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_IN7_DZIENNIK_KORESP_tree_UPDATE` BEFORE UPDATE ON `IN7_DZIENNIK_KORESP`
 				FOR EACH ROW BEGIN
 					IF NEW.ID_PROJECT IS NULL THEN
 						SET NEW.path = '';
@@ -334,7 +334,7 @@ jQuery(document).ready(function () {
 		";
 		$sqlList['RemoveTrigger_BeforeInsertProblems'] = "DROP TRIGGER IF EXISTS `_PROBLEMS_tree_INSERT`";
 		$sqlList['CreateTrigger_BeforeInsertProblems'] = "
-			CREATE TRIGGER `_PROBLEMS_tree_INSERT` BEFORE INSERT ON `PROBLEMS`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_PROBLEMS_tree_INSERT` BEFORE INSERT ON `PROBLEMS`
 				FOR EACH ROW BEGIN
 					IF NEW.ID_PROJECT IS NOT NULL and NEW.ID_PROJECT>0 THEN
 						-- SET NEW.ID_PROJECT_path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.ID_PROJECT);
@@ -346,7 +346,7 @@ jQuery(document).ready(function () {
 		";
 		$sqlList['RemoveTrigger_BeforeUpdateProblems'] = "DROP TRIGGER IF EXISTS `_PROBLEMS_tree_UPDATE`";
 		$sqlList['CreateTrigger_BeforeUpdateProblems'] = "
-			CREATE TRIGGER `_PROBLEMS_tree_UPDATE` BEFORE UPDATE ON `PROBLEMS`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_PROBLEMS_tree_UPDATE` BEFORE UPDATE ON `PROBLEMS`
 				FOR EACH ROW BEGIN
 					IF NEW.ID_PROJECT IS NULL THEN
 						SET NEW.ID_PROJECT_path = '';
@@ -437,12 +437,12 @@ jQuery(document).ready(function () {
 /**
  * Old triggers before 2015-06-10:
 
-CREATE TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_INSERT` BEFORE INSERT ON `IN7_MK_BAZA_DYSTRYBUCJI`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_INSERT` BEFORE INSERT ON `IN7_MK_BAZA_DYSTRYBUCJI`
 	FOR EACH ROW BEGIN
 		SET NEW.path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.P_ID);
 	END
 
-CREATE TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_UPDATE` BEFORE UPDATE ON `IN7_MK_BAZA_DYSTRYBUCJI`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_UPDATE` BEFORE UPDATE ON `IN7_MK_BAZA_DYSTRYBUCJI`
 	FOR EACH ROW BEGIN
 		IF NEW.P_ID<>OLD.P_ID THEN
 			SET NEW.path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.P_ID);
@@ -452,14 +452,14 @@ CREATE TRIGGER `_IN7_MK_BAZA_DYSTRYBUCJI_tree_UPDATE` BEFORE UPDATE ON `IN7_MK_B
 	END
 
 
-CREATE TRIGGER `_IN7_DZIENNIK_KORESP_tree_INSERT` BEFORE INSERT ON `IN7_DZIENNIK_KORESP`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_IN7_DZIENNIK_KORESP_tree_INSERT` BEFORE INSERT ON `IN7_DZIENNIK_KORESP`
 	FOR EACH ROW BEGIN
 		IF NEW.ID_PROJECT IS NOT NULL THEN
 			SET NEW.path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.ID_PROJECT);
 		END IF;
 	END
 
-CREATE TRIGGER `_IN7_DZIENNIK_KORESP_tree_UPDATE` BEFORE UPDATE ON `IN7_DZIENNIK_KORESP`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_IN7_DZIENNIK_KORESP_tree_UPDATE` BEFORE UPDATE ON `IN7_DZIENNIK_KORESP`
 	FOR EACH ROW BEGIN
 		IF NEW.ID_PROJECT is null THEN
 			SET NEW.path = '';
@@ -468,14 +468,14 @@ CREATE TRIGGER `_IN7_DZIENNIK_KORESP_tree_UPDATE` BEFORE UPDATE ON `IN7_DZIENNIK
 		END IF;
 	END
 
-CREATE TRIGGER `_PROBLEMS_tree_INSERT` BEFORE INSERT ON `PROBLEMS`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_PROBLEMS_tree_INSERT` BEFORE INSERT ON `PROBLEMS`
 	FOR EACH ROW BEGIN
 		IF NEW.ID_PROJECT IS NOT NULL THEN
 			SET NEW.ID_PROJECT_path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.ID_PROJECT);
 		END IF;
 	END
 
-CREATE TRIGGER `_PROBLEMS_tree_UPDATE` BEFORE UPDATE ON `PROBLEMS`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_PROBLEMS_tree_UPDATE` BEFORE UPDATE ON `PROBLEMS`
 	FOR EACH ROW BEGIN
 		IF NEW.ID_PROJECT is null THEN
 			SET NEW.ID_PROJECT_path = '';

+ 10 - 10
SE/se-lib/Route/FixZasobPath.php

@@ -185,7 +185,7 @@ jQuery(document).ready(function () {
 		";
 		$sqlList['RemoveTrigger_BeforeInsertZasob'] = "DROP TRIGGER IF EXISTS `_CRM_LISTA_ZASOBOW_tree_INSERT`";
 		$sqlList['CreateTrigger_BeforeInsertZasob'] = "
-			CREATE TRIGGER `_CRM_LISTA_ZASOBOW_tree_INSERT` BEFORE INSERT ON `CRM_LISTA_ZASOBOW`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_LISTA_ZASOBOW_tree_INSERT` BEFORE INSERT ON `CRM_LISTA_ZASOBOW`
 				FOR EACH ROW BEGIN
 					-- SET NEW.path = CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/', NEW.PARENT_ID);
 					SET NEW.path = (select CONCAT(
@@ -202,7 +202,7 @@ jQuery(document).ready(function () {
 		";
 		$sqlList['RemoveTrigger_AfterInsertZasob'] = "DROP TRIGGER IF EXISTS `_CRM_LISTA_ZASOBOW_tree_AFTER_INSERT`";
 		$sqlList['CreateTrigger_AfterInsertZasob'] = "
-			CREATE TRIGGER `_CRM_LISTA_ZASOBOW_tree_AFTER_INSERT` AFTER INSERT ON `CRM_LISTA_ZASOBOW`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_LISTA_ZASOBOW_tree_AFTER_INSERT` AFTER INSERT ON `CRM_LISTA_ZASOBOW`
 				FOR EACH ROW BEGIN
 					insert into `_zasob_path_idx` (`ID`, `P_ID`, `DESC`, `idx_PATH`, `idx_PATH_DESC`)
 						values(
@@ -238,7 +238,7 @@ jQuery(document).ready(function () {
 		//  #1146 - Table '{DATABASE_NAME}.P5-MSG:Route_FixZasobPath:ERROR: Parent item not exists' doesn't exist
 		//  #1146 - Table '{DATABASE_NAME}.P5-MSG:Route_FixZasobPath:ERROR: Loop detected in path' doesn't exist
 		$sqlList['CreateTrigger_BeforeUpdateZasob'] = "
-			CREATE TRIGGER `_CRM_LISTA_ZASOBOW_tree_UPDATE` BEFORE UPDATE ON `CRM_LISTA_ZASOBOW`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_LISTA_ZASOBOW_tree_UPDATE` BEFORE UPDATE ON `CRM_LISTA_ZASOBOW`
 				FOR EACH ROW BEGIN
 					-- IF NEW.PARENT_ID<>OLD.PARENT_ID or NEW.`DESC`<>OLD.`DESC` THEN
 					-- SET NEW.path = CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/', NEW.PARENT_ID);
@@ -296,7 +296,7 @@ jQuery(document).ready(function () {
 		// throws errors:
 		//  #1146 - Table '{DATABASE_NAME}.WARNING: Update all paths' doesn't exist
 		$sqlList['CreateTrigger_AfterUpdateZasob'] = "
-			CREATE TRIGGER `_CRM_LISTA_ZASOBOW_tree_AFTER_UPDATE` AFTER UPDATE ON `CRM_LISTA_ZASOBOW`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_LISTA_ZASOBOW_tree_AFTER_UPDATE` AFTER UPDATE ON `CRM_LISTA_ZASOBOW`
 				FOR EACH ROW BEGIN
 					IF NEW.`PARENT_ID`!=OLD.`PARENT_ID` or NEW.`DESC`!=OLD.`DESC` THEN
 						-- throw warning to update all pathes in `CRM_LISTA_ZASOBOW` with path under current?
@@ -326,7 +326,7 @@ jQuery(document).ready(function () {
 		";
 		$sqlList['RemoveTrigger_BeforeInsertWskaznik'] = "DROP TRIGGER IF EXISTS `_CRM_WSKAZNIK_tree_INSERT`";
 		$sqlList['CreateTrigger_BeforeInsertWskaznik'] = "
-			CREATE TRIGGER `_CRM_WSKAZNIK_tree_INSERT` BEFORE INSERT ON `CRM_WSKAZNIK`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_WSKAZNIK_tree_INSERT` BEFORE INSERT ON `CRM_WSKAZNIK`
 				FOR EACH ROW BEGIN
 					IF NEW.ID_ZASOB IS NOT NULL and NEW.ID_ZASOB>0 THEN
 						-- SET NEW.path_CRM_LISTA_ZASOBOW = CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/', NEW.ID_ZASOB);
@@ -338,7 +338,7 @@ jQuery(document).ready(function () {
 		";
 		$sqlList['RemoveTrigger_BeforeUpdateWskaznik'] = "DROP TRIGGER IF EXISTS `_CRM_WSKAZNIK_tree_UPDATE`";
 		$sqlList['CreateTrigger_BeforeUpdateWskaznik'] = "
-			CREATE TRIGGER `_CRM_WSKAZNIK_tree_UPDATE` BEFORE UPDATE ON `CRM_WSKAZNIK`
+			CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_WSKAZNIK_tree_UPDATE` BEFORE UPDATE ON `CRM_WSKAZNIK`
 				FOR EACH ROW BEGIN
 					IF NEW.ID_ZASOB IS NULL THEN
 						SET NEW.path_CRM_LISTA_ZASOBOW = '';
@@ -429,12 +429,12 @@ jQuery(document).ready(function () {
 /**
  * Old triggers before 2015-06-16:
 
-CREATE TRIGGER `_CRM_LISTA_ZASOBOW_tree_INSERT` BEFORE INSERT ON `CRM_LISTA_ZASOBOW`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_LISTA_ZASOBOW_tree_INSERT` BEFORE INSERT ON `CRM_LISTA_ZASOBOW`
 	FOR EACH ROW BEGIN
 		SET NEW.path = CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/', NEW.PARENT_ID);
 	END
 
-CREATE TRIGGER `_CRM_LISTA_ZASOBOW_tree_UPDATE` BEFORE UPDATE ON `CRM_LISTA_ZASOBOW`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_LISTA_ZASOBOW_tree_UPDATE` BEFORE UPDATE ON `CRM_LISTA_ZASOBOW`
 	FOR EACH ROW BEGIN
 		IF NEW.PARENT_ID<>OLD.PARENT_ID or NEW.`DESC`<>OLD.`DESC` THEN
 			SET NEW.path = CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/', NEW.PARENT_ID);
@@ -443,12 +443,12 @@ CREATE TRIGGER `_CRM_LISTA_ZASOBOW_tree_UPDATE` BEFORE UPDATE ON `CRM_LISTA_ZASO
 		END IF;
 	END
 
-CREATE TRIGGER `_CRM_WSKAZNIK_tree_INSERT` BEFORE INSERT ON `CRM_WSKAZNIK`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_WSKAZNIK_tree_INSERT` BEFORE INSERT ON `CRM_WSKAZNIK`
 	FOR EACH ROW BEGIN
 		SET NEW.path_CRM_LISTA_ZASOBOW = CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/', NEW.ID_ZASOB);
 	END
 
-CREATE TRIGGER `_CRM_WSKAZNIK_tree_UPDATE` BEFORE UPDATE ON `CRM_WSKAZNIK`
+CREATE DEFINER=`root`@`localhost` TRIGGER `_CRM_WSKAZNIK_tree_UPDATE` BEFORE UPDATE ON `CRM_WSKAZNIK`
 	FOR EACH ROW BEGIN
 		IF NEW.ID_ZASOB<>OLD.ID_ZASOB THEN
 			SET NEW.path_CRM_LISTA_ZASOBOW = CRM_LISTA_ZASOBOW_hierarchy_sys_connect_by_path('/', NEW.ID_ZASOB);

+ 55 - 11
SE/se-lib/TableAjax.php

@@ -388,6 +388,8 @@ class TableAjax extends ViewAjax {
 
 .ui-resizable-s { bottom:0; }
 .ui-resizable-e { right:0; }
+.AjaxTableCont-mapEditorContainer .ui-resizable-s { background-color:#ddd; }
+.AjaxTableCont-mapEditorContainer .ui-resizable-s:hover { background-color:#888; }
 	</style>
 
 		<div class="AjaxTableCont">
@@ -1908,6 +1910,7 @@ class TableAjax extends ViewAjax {
 						priv.mapEditorHide();
 						priv.options.mapEditorContainer = 'window';
 						priv.mapEditorShow();
+						priv.resizableMapDockNode('destroy');
 					}
 				},
 				onSaveFeature: function(selectedRecordId, selectedFeatureExtent) {
@@ -2000,15 +2003,30 @@ class TableAjax extends ViewAjax {
 					_mapEditorWrap.append(mapEditor);
 				}
 
+				_mapEditorWrap.css({padding:'5px'});
 				_mapEditorDialog = _mapEditorWrap.dialog({
 					width: 540,
 					minWidth: 400,
 					minHeight: 400,
-					resizeStop: function(){
-						_mapEditor.TableAjaxMapUpdateSize(); //to prevent drag-zoom error
+					open: function(e, ui) {
+						var n = jQuery(this),
+								mapWrap = n.children(":first"),
+								map = mapWrap.children(":first");
+						map.css({width: n.width() - 5, height: n.height() - 5});
+						_mapEditor.TableAjaxMapUpdateSize();
 					},
-					dragStop: function(){
-						_mapEditor.TableAjaxMapUpdateSize(); //to prevent drag-zoom error
+					resizeStart: function(e, ui) {
+						jQuery(this).children(":first").children(":first").css({display:'none'});
+					},
+					resizeStop: function(e, ui){
+						var n = jQuery(this),
+								map = n.children(":first").children(":first");
+						n.css({width: n.parent().width()});
+						map.css({display: 'block', height: n.height(), width: n.width()});
+						_mapEditor.TableAjaxMapUpdateSize();
+					},
+					dragStop: function(e, ui){
+						_mapEditor.TableAjaxMapUpdateSize();// to prevent drag-zoom error
 					}
 				});
 				_mapEditorWrap.bind('dialogclose', function(e) {
@@ -2027,22 +2045,45 @@ class TableAjax extends ViewAjax {
 				}
 			}
 			else if ('dock' == priv.options.mapEditorContainer) {
+				priv.resizableMapDockNode('prepare');
+				_mapEditor.TableAjaxMapUpdateSize();
+			}
+		};
+
+		priv.resizableMapDockNode = function(task) {
+			if ('prepare' == task) {
 				var mapEditor = _mapEditorWrap.children('.mapEditor-map');
 				if (mapEditor && mapEditor.length) {// map is inside _mapEditorWrap (window)
-					_mapDockNode = jQuery('<div class="AjaxTableCont-mapEditorContainer"></div>');
+					var mapDockNode = jQuery('<div class="AjaxTableCont-mapEditorContainer"></div>');
 					var tblCont = jQuery(_cont).parent('.AjaxTableCont');
 					tblCont.children('.AjaxTableCont-mapEditorContainer').remove();
 					var breadcrumb = tblCont.children('.breadcrumb');
 					if (!breadcrumb || !breadcrumb.length) {
-						tblCont.prepend(_mapDockNode);
+						tblCont.prepend(mapDockNode);
 					} else {
-						_mapDockNode.insertAfter(breadcrumb);
+						mapDockNode.insertAfter(breadcrumb);
 					}
-					_mapDockNode.append(mapEditor);					
+					mapDockNode.append(mapEditor);
 				}
-				_mapEditor.TableAjaxMapUpdateSize();
+				var mapDockResizable = mapEditor.parent();
+				mapDockResizable.resizable({handles: 's', minHeight: 300, minWidth: 300});
+				var resizeLineHeigth = 6;
+				mapDockResizable.children(":first").css({height: 'auto'});
+				mapDockResizable.css({marginBottom: resizeLineHeigth+'px'});
+				mapEditor.css({marginBottom: resizeLineHeigth+'px'});
+				mapEditor.children(":first").css({width: mapEditor.width()});
+				mapDockResizable.find('.ui-resizable-s').css({height:resizeLineHeigth+'px', bottom: '-'+resizeLineHeigth+'px'});
+				mapDockResizable.on('resizestart', function(event, ui) {
+					ui.element.children(":first").children(":first").css({display:'none'})
+				});
+				mapDockResizable.on('resizestop', function(event, ui) {
+					ui.element.children(":first").children(":first").css({display:'block', height: ui.element.height()});
+				});
+			} else if ('destroy' == task) {
+				var mapDockResizable = jQuery(_cont).parent('.AjaxTableCont').children('.AjaxTableCont-mapEditorContainer');
+				mapDockResizable.resizable('destroy');
+				mapDockResizable.remove();
 			}
-
 		};
 
 		priv.mapEditorChanged = function(e) {
@@ -2275,9 +2316,12 @@ class TableAjax extends ViewAjax {
 				_inlineEditBox.show();
 				_inlineEditBox.on('shown.bs.modal', function(e) {
 					var dialogBox = jQuery(this).find('.modal-dialog'),
-							modalBody = dialogBox.find('.modal-body');
+							modalBody = dialogBox.find('.modal-body'),
+							offset = dialogBox.offset();
+					dialogBox.css({position: 'absolute', margin:0, top: offset.top, left: offset.left});
 					modalBody.css({overflow: 'scroll'});
 					dialogBox.resizable({minHeight: 300, minWidth: 300, alsoResize: modalBody});
+					dialogBox.draggable();
 				});
 				_inlineEditBox.find('input[name=ID]').val(e.data.id);
 				_inlineEditBox.find('input[name=col]').val(e.data.col);

+ 6 - 5
SE/se-lib/TableAjaxMap.php

@@ -178,9 +178,9 @@ var myOpenLayers_Control_ManageLayers = OpenLayers.Class(OpenLayers.Control, {
 		if (this.layers.length > 0) {
 			return false;
 		}
-		var layerName = 'Babidol';
+		var layerName = 'Dodatkowy podkład z pliku dxf';
 		var wfsUrl = 'http://biuro.biall-net.pl/wps';
-		wfsUrl += '/21176/BABIDOL_DXF_SHP';// TODO: user choise by perms/item links
+		wfsUrl += '/21176/BUILDINGS_PODKLAD_DXF_SHP';// TODO: user choice by perms/item links
 		var _styleMap = new OpenLayers.StyleMap({
 			'default': new OpenLayers.Style(null, {
 				rules: [
@@ -197,7 +197,7 @@ var myOpenLayers_Control_ManageLayers = OpenLayers.Class(OpenLayers.Control, {
 			})
 		});
 		var testLayerBabidol = new OpenLayers.Layer.Vector(layerName, {
-			strategies: [new OpenLayers.Strategy.BBOX(), new OpenLayers.Strategy.Cluster({distance:20, threshold:10})],
+			strategies: [new OpenLayers.Strategy.BBOX()],//, new OpenLayers.Strategy.Cluster({distance:20, threshold:16})
 			projection: new OpenLayers.Projection("EPSG:4326"),
 			protocol: new OpenLayers.Protocol.WFS({
 				version: "1.1.0",
@@ -279,6 +279,7 @@ var myOpenLayers_Control_ManageLayers = OpenLayers.Class(OpenLayers.Control, {
 			priv.options.zoomStrategyActivate = (priv.options.zoomStrategyActivate > 0)? priv.options.zoomStrategyActivate : 15;
 
 			var div = $('<div></div>');
+			div.css({display: 'none'});
 			div.append(_nodeProcesses);
 			div.append(_nodeAbstract);
 			div.append(_nodeInput);
@@ -1231,8 +1232,8 @@ var myOpenLayers_Control_ManageLayers = OpenLayers.Class(OpenLayers.Control, {
 			$urlQuery[$parts[0]] = $parts[1];
 		}
 		$urlPath = explode('/', trim($urlPath, "/ \n\t\r\0\x0B"));
-		if (count($urlPath) > 2) {// /wps/21176/BABIDOL_DXF_SHP
-			if ($urlPath[1] == '21176' && $urlPath[2] == 'BABIDOL_DXF_SHP') {
+		if (count($urlPath) > 2) {// /wps/21176/BUILDINGS_PODKLAD_DXF_SHP
+			if ($urlPath[1] == '21176' && $urlPath[2] == 'BUILDINGS_PODKLAD_DXF_SHP') {
 				$tableId = $urlPath[1];
 				$userAcl = User::getAcl();
 				$userAcl->fetchGroups();

+ 2 - 2
SE/superedit-CRM_LISTA_ZASOBOW_ACL.php

@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `CRM_LISTA_ZASOBOW_ACL` (
 		
 		
 		
-		$sql="CREATE TRIGGER `CRM_LISTA_ZASOBOW_ACL_INSERT` AFTER INSERT ON `CRM_LISTA_ZASOBOW_ACL`
+		$sql="CREATE DEFINER=`root`@`localhost` TRIGGER `CRM_LISTA_ZASOBOW_ACL_INSERT` AFTER INSERT ON `CRM_LISTA_ZASOBOW_ACL`
 		FOR EACH ROW update CRM_LISTA_ZASOBOW set PARENT_ID_MAP=
 		(select group_concat(cast(DST_ID as CHAR)) from CRM_LISTA_ZASOBOW_ACL
 		where SRC_ID=NEW.SRC_ID and A_STATUS='NORMAL' and RELATION='PARENT_ID_MAP'
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS `CRM_LISTA_ZASOBOW_ACL` (
 		where ID=NEW.SRC_ID
 		";
 		DB::query($sql);
-		$sql="CREATE TRIGGER `CRM_LISTA_ZASOBOW_ACL_UPDATE` AFTER UPDATE ON `CRM_LISTA_ZASOBOW_ACL`
+		$sql="CREATE DEFINER=`root`@`localhost` TRIGGER `CRM_LISTA_ZASOBOW_ACL_UPDATE` AFTER UPDATE ON `CRM_LISTA_ZASOBOW_ACL`
 		FOR EACH ROW update CRM_LISTA_ZASOBOW set PARENT_ID_MAP=
 		(select group_concat(cast(DST_ID as CHAR)) from CRM_LISTA_ZASOBOW_ACL
 		where SRC_ID=NEW.SRC_ID and A_STATUS='NORMAL' and RELATION='PARENT_ID_MAP'

+ 2 - 2
SE/superedit-SYNC_GIS_TABLES.php

@@ -354,7 +354,7 @@ function SYNC_GIS_TABLES() {
 						 			  $gdb->query($sql);
 						 			  
 						 			  if($col=='A_RECORD_UPDATE_DATE') {
-							 			  $gdb->query("CREATE TRIGGER update_A_RECORD_UPDATE_DATE BEFORE UPDATE
+							 			  $gdb->query("CREATE DEFINER=`root`@`localhost` TRIGGER update_A_RECORD_UPDATE_DATE BEFORE UPDATE
 							 			 			 ON \"".$gis_table."\" FOR EACH ROW EXECUTE PROCEDURE 
 							 			 			 update_A_RECORD_UPDATE_DATE_column();");
 						 			  }
@@ -664,7 +664,7 @@ DEBUG_S(-3,'CheckPoint',null,__FILE__,__FUNCTION__,__LINE__);
 						
 						
 						 
-			$gdb->query("CREATE TRIGGER update_A_RECORD_UPDATE_DATE BEFORE UPDATE
+			$gdb->query("CREATE DEFINER=`root`@`localhost` TRIGGER update_A_RECORD_UPDATE_DATE BEFORE UPDATE
 						ON \"".$tbl."\" FOR EACH ROW EXECUTE PROCEDURE 
 						update_A_RECORD_UPDATE_DATE_column();");
 			//$gdb->query('alter table "'.$tbl.'" add  "the_geom" serial primary key ;');	 //todo before "ID" 

+ 5 - 5
SE/superedit-USERS2_OFFERS.php

@@ -31,7 +31,7 @@ function USERS2_OFFERS() {
 			if ($db->has_errors()) {
 				echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">DB Errors: ';print_r($db->get_errors());echo'</pre>';
 			} else {
-				echo '<br />' . "Poprawiono " . $db->affected_rows() . " rekordów.";
+				echo '<br />' . "Poprawiono " . $db->affected_rows() . " rekordów.";
 			}
 		}
 	}
@@ -52,11 +52,11 @@ function USERS2_OFFERS_HIST() {
  * triggers:
 
 --
--- 
+--
 --
 DROP TRIGGER IF EXISTS `PRICE_NETTO_before_update_USERS2_OFFERS`;
 DELIMITER $$
-CREATE TRIGGER `PRICE_NETTO_before_update_USERS2_OFFERS` BEFORE UPDATE ON `USERS2_OFFERS`
+CREATE DEFINER=`root`@`localhost` TRIGGER `PRICE_NETTO_before_update_USERS2_OFFERS` BEFORE UPDATE ON `USERS2_OFFERS`
 	FOR EACH ROW BEGIN
 		IF NEW.`P_CONTRACT_PRICE` != OLD.`P_CONTRACT_PRICE`
 				or NEW.`P_PROMO_MONTH_PRICE` != OLD.`P_PROMO_MONTH_PRICE`
@@ -85,11 +85,11 @@ CREATE TRIGGER `PRICE_NETTO_before_update_USERS2_OFFERS` BEFORE UPDATE ON `USERS
 $$
 
 --
--- 
+--
 --
 DROP TRIGGER IF EXISTS `PRICE_NETTO_before_insert_USERS2_OFFERS`;
 DELIMITER $$
-CREATE TRIGGER `PRICE_NETTO_before_insert_USERS2_OFFERS` BEFORE INSERT ON `USERS2_OFFERS`
+CREATE DEFINER=`root`@`localhost` TRIGGER `PRICE_NETTO_before_insert_USERS2_OFFERS` BEFORE INSERT ON `USERS2_OFFERS`
 	FOR EACH ROW BEGIN
 		SET NEW.`P_CONTRACT_PRICE_NETTO`    = round(NEW.`P_CONTRACT_PRICE`    / (1 + NEW.`STAWKA_VAT`/100), 2);
 		SET NEW.`P_PROMO_MONTH_PRICE_NETTO` = round(NEW.`P_PROMO_MONTH_PRICE` / (1 + NEW.`STAWKA_VAT`/100), 2);