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

Msgs fix update project and zasob path

Piotr Labudda 10 лет назад
Родитель
Сommit
583af151fb
3 измененных файлов с 19 добавлено и 92 удалено
  1. 1 18
      SE/se-lib/Route/FixProjectPath.php
  2. 1 18
      SE/se-lib/Route/FixZasobPath.php
  3. 17 56
      SE/se-lib/Route/Msgs.php

+ 1 - 18
SE/se-lib/Route/FixProjectPath.php

@@ -270,24 +270,7 @@ jQuery(document).ready(function () {
 					IF NEW.`P_ID`!=OLD.`P_ID` THEN
 						-- throw warning to update all pathes in `IN7_MK_BAZA_DYSTRYBUCJI` with path under current?
 						IF (select count(1) from `IN7_MK_BAZA_DYSTRYBUCJI` p where p.`P_ID`=NEW.ID) > 0 THEN
-							IF (select count(1) from `CRM_UI_MSGS` where `app_className`='FixProjectPath'
-										and `msg`='Update all paths'
-										and `uiTargetType`='default_db_table'
-										and `uiTargetName`='IN7_MK_BAZA_DYSTRYBUCJI'
-										and `A_STATUS`='WAITING'
-									) = 0 THEN
-								INSERT INTO `CRM_UI_MSGS` (`ID`
-										, `app_className`, `msg`, `msgType`
-										, `uiTargetType`, `uiTargetName`
-										, `userTargetType`
-										, `A_RECORD_CREATE_DATE`, `A_RECORD_CREATE_AUTHOR`)
-									VALUES (NULL
-										, 'FixProjectPath', 'Update all paths', 'danger'
-										, 'default_db_table', 'IN7_MK_BAZA_DYSTRYBUCJI'
-										, 'everyone'
-										, NOW(), NEW.A_RECORD_UPDATE_AUTHOR
-									);
-							END IF;
+							CALL CRM_UI_MSGS__addTableEveryoneUniqueMsg(NEW.A_RECORD_UPDATE_AUTHOR, 'FixProjectPath', 'danger', 'Update all paths', 'IN7_MK_BAZA_DYSTRYBUCJI');
 							UPDATE `P5-MSG:Route_FixProjectPath:WARNING: Update all paths` SET x=1;
 						END IF;
 					END IF;

+ 1 - 18
SE/se-lib/Route/FixZasobPath.php

@@ -292,24 +292,7 @@ jQuery(document).ready(function () {
 					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?
 						IF (select count(1) from `CRM_LISTA_ZASOBOW` p where p.`PARENT_ID`=NEW.ID) > 0 THEN
-							IF (select count(1) from `CRM_UI_MSGS` where `app_className`='FixZasobPath'
-										and `msg`='Update all paths'
-										and `uiTargetType`='default_db_table'
-										and `uiTargetName`='CRM_LISTA_ZASOBOW'
-										and `A_STATUS`='WAITING'
-									) = 0 THEN
-								INSERT INTO `CRM_UI_MSGS` (`ID`
-										, `app_className`, `msg`, `msgType`
-										, `uiTargetType`, `uiTargetName`
-										, `userTargetType`
-										, `A_RECORD_CREATE_DATE`, `A_RECORD_CREATE_AUTHOR`)
-									VALUES (NULL
-										, 'FixZasobPath', 'Update all paths', 'danger'
-										, 'default_db_table', 'CRM_LISTA_ZASOBOW'
-										, 'everyone'
-										, NOW(), NEW.A_RECORD_UPDATE_AUTHOR
-									);
-							END IF;
+							CALL CRM_UI_MSGS__addTableEveryoneUniqueMsg(NEW.A_RECORD_UPDATE_AUTHOR, 'FixZasobPath', 'danger', 'Update all paths', 'CRM_LISTA_ZASOBOW');
 							UPDATE `P5-MSG:Route_FixZasobPath:WARNING: Update all paths` SET x=1;
 						END IF;
 					END IF;

+ 17 - 56
SE/se-lib/Route/Msgs.php

@@ -159,33 +159,12 @@ BEGIN
 	CALL CRM_UI_MSGS__addUniqueMsg(author, app_className, msgType, msg, 'default_db_table', uiTargetName, 'everyone', '');
 END
 SQL_QUERY;
-		$formFixCrmProcesIdx = <<<SQL_QUERY
-		CALL CRM_UI_MSGS__addUniqueMsg(coalesce(NEW.A_RECORD_UPDATE_AUTHOR,':AFTER_INSERT'), 'FixCrmProcesInitIdx', 'danger', 'Update perms', 'default_db_table', 'CRM_PROCES', 'everyone');
-		CALL CRM_UI_MSGS__addTableEveryoneUniqueMsg(coalesce(NEW.A_RECORD_CREATE_AUTHOR,':AFTER_INSERT'), 'FixCrmProcesInitIdx', 'danger', 'Update perms', 'CRM_PROCES');
-		IF (select count(1) from `CRM_UI_MSGS` where `app_className`='FixCrmProcesInitIdx'
-				and `msg`='Update perms'
-				and `uiTargetType`='default_db_table'
-				and `uiTargetName`='CRM_PROCES'
-				and `A_STATUS`='WAITING'
-			) = 0 THEN
-			INSERT INTO `CRM_UI_MSGS` (`ID`
-					, `app_className`, `msg`, `msgType`
-					, `uiTargetType`, `uiTargetName`
-					, `userTargetType`
-					, `A_RECORD_CREATE_DATE`, `A_RECORD_CREATE_AUTHOR`)
-				VALUES (NULL
-					, 'FixCrmProcesInitIdx', 'Update perms', 'danger'
-					, 'default_db_table', 'CRM_PROCES'
-					, 'everyone'
-					, NOW(), coalesce(NEW.A_RECORD_CREATE_AUTHOR,'trigger:FixCrmProcesInitIdx_CRM_PROCES_AFTER_INSERT')
-				);
-		END IF;
-
-		CALL CRM_UI_MSGS__addTableEveryoneUniqueMsg(coalesce(NEW.A_RECORD_UPDATE_AUTHOR,':AFTER_UPDATE'), 'FixCrmProcesInitIdx', 'danger', 'Update perms', 'CRM_PROCES');
-		IF (select count(1) from `CRM_UI_MSGS` where `app_className`='FixCrmProcesInitIdx'
-					and `msg`='Update perms'
+		$formFixZasobPath = <<<SQL_QUERY
+		CALL CRM_UI_MSGS__addTableEveryoneUniqueMsg(NEW.A_RECORD_UPDATE_AUTHOR, 'FixZasobPath', 'danger', 'Update all paths', 'CRM_LISTA_ZASOBOW');
+		IF (select count(1) from `CRM_UI_MSGS` where `app_className`='FixZasobPath'
+					and `msg`='Update all paths'
 					and `uiTargetType`='default_db_table'
-					and `uiTargetName`='CRM_PROCES'
+					and `uiTargetName`='CRM_LISTA_ZASOBOW'
 					and `A_STATUS`='WAITING'
 				) = 0 THEN
 			INSERT INTO `CRM_UI_MSGS` (`ID`
@@ -194,18 +173,19 @@ SQL_QUERY;
 					, `userTargetType`
 					, `A_RECORD_CREATE_DATE`, `A_RECORD_CREATE_AUTHOR`)
 				VALUES (NULL
-					, 'FixCrmProcesInitIdx', 'Update perms', 'danger'
-					, 'default_db_table', 'CRM_PROCES'
+					, 'FixZasobPath', 'Update all paths', 'danger'
+					, 'default_db_table', 'CRM_LISTA_ZASOBOW'
 					, 'everyone'
-					, NOW(), coalesce(NEW.A_RECORD_UPDATE_AUTHOR,'trigger:FixCrmProcesInitIdx_CRM_PROCES_AFTER_UPDATE')
+					, NOW(), NEW.A_RECORD_UPDATE_AUTHOR
 				);
 		END IF;
-
-		CALL CRM_UI_MSGS__addTableEveryoneUniqueMsg(coalesce(NEW.A_RECORD_CREATE_AUTHOR,':AFTER_INSERT_WSK'), 'FixCrmProcesInitIdx', 'danger', 'Update perms', 'CRM_PROCES');
-		IF (select count(1) from `CRM_UI_MSGS` where `app_className`='FixCrmProcesInitIdx'
-					and `msg`='Update perms'
+SQL_QUERY;
+		$formFixProjectPath = <<<SQL_QUERY
+		CALL CRM_UI_MSGS__addTableEveryoneUniqueMsg(NEW.A_RECORD_UPDATE_AUTHOR, 'FixProjectPath', 'danger', 'Update all paths', 'IN7_MK_BAZA_DYSTRYBUCJI');
+		IF (select count(1) from `CRM_UI_MSGS` where `app_className`='FixProjectPath'
+					and `msg`='Update all paths'
 					and `uiTargetType`='default_db_table'
-					and `uiTargetName`='CRM_PROCES'
+					and `uiTargetName`='IN7_MK_BAZA_DYSTRYBUCJI'
 					and `A_STATUS`='WAITING'
 				) = 0 THEN
 			INSERT INTO `CRM_UI_MSGS` (`ID`
@@ -214,32 +194,13 @@ SQL_QUERY;
 					, `userTargetType`
 					, `A_RECORD_CREATE_DATE`, `A_RECORD_CREATE_AUTHOR`)
 				VALUES (NULL
-					, 'FixCrmProcesInitIdx', 'Update perms', 'danger'
-					, 'default_db_table', 'CRM_PROCES'
+					, 'FixProjectPath', 'Update all paths', 'danger'
+					, 'default_db_table', 'IN7_MK_BAZA_DYSTRYBUCJI'
 					, 'everyone'
-					, NOW(), coalesce(NEW.A_RECORD_CREATE_AUTHOR,'trigger:FixCrmProcesInitIdx_CRM_WSKAZNIK_AFTER_INSERT')
+					, NOW(), NEW.A_RECORD_UPDATE_AUTHOR
 				);
 		END IF;
 
-		CALL CRM_UI_MSGS__addTableEveryoneUniqueMsg(coalesce(NEW.A_RECORD_UPDATE_AUTHOR,':AFTER_UPDATE_WSK'), 'FixCrmProcesInitIdx', 'danger', 'Update perms', 'CRM_PROCES');
-		IF (select count(1) from `CRM_UI_MSGS` where `app_className`='FixCrmProcesInitIdx'
-					and `msg`='Update perms'
-					and `uiTargetType`='default_db_table'
-					and `uiTargetName`='CRM_PROCES'
-					and `A_STATUS`='WAITING'
-				) = 0 THEN
-			INSERT INTO `CRM_UI_MSGS` (`ID`
-					, `app_className`, `msg`, `msgType`
-					, `uiTargetType`, `uiTargetName`
-					, `userTargetType`
-					, `A_RECORD_CREATE_DATE`, `A_RECORD_CREATE_AUTHOR`)
-				VALUES (NULL
-					, 'FixCrmProcesInitIdx', 'Update perms', 'danger'
-					, 'default_db_table', 'CRM_PROCES'
-					, 'everyone'
-					, NOW(), coalesce(NEW.A_RECORD_UPDATE_AUTHOR,'trigger:FixCrmProcesInitIdx_CRM_WSKAZNIK_AFTER_UPDATE')
-				);
-		END IF;
 SQL_QUERY;
 		$db = DB::getDB();
 		if ($db->has_errors()) {