Browse Source

fixed Storage acl reinstall default action

Piotr Labudda 8 năm trước cách đây
mục cha
commit
a9f053442b
1 tập tin đã thay đổi với 44 bổ sung44 xóa
  1. 44 44
      SE/se-lib/Route/Storage/AclReinstall.php

+ 44 - 44
SE/se-lib/Route/Storage/AclReinstall.php

@@ -28,54 +28,54 @@ class Route_Storage_AclReinstall extends RouteBase {
 				], "<i class=\"glyphicon glyphicon-arrow-left\"></i> Wróć do struktury"),
 			]);
 
-			if ('reinstall' !== V::get('_postTask', '', $_POST)) {
-				echo UI::hButtonPost("Reinstall", [
-					'data' => [
-						'_postTask' => 'reinstall'
-					],
-					'class' => 'btn btn-md btn-danger',
-					'title' => "Reinstall structure"
-				]);
-				echo '<hr>';
-				try {
-					$this->printReinstallPreview($namespace);
-				} catch (Exception $e) {
-					DBG::log($e);
-					UI::alert('danger', $e->getMessage());
+			if ('reinstall' == V::get('_postTask', '', $_POST)) {
+				Lib::loadClass('Schema_SystemObjectFieldStorageAcl');
+				$objFieldAcl = new Schema_SystemObjectFieldStorageAcl();
+				$objFieldAcl->updateCache($namespace);
+
+				DBG::nicePrint([
+					'idInstance' => ACL::getInstanceId($namespace),
+					'rootInstance' => ACL::getRootNamespace($namespace),
+					'conf' => ACL::fetchInstanceConfig($namespace),
+					'table' => ACL::getInstanceTable($namespace),
+				], "dbg");
+
+				{
+					$item = SchemaFactory::loadDefaultObject('SystemObject')->getItem($namespace, [ 'propertyName' => '*,field' ]);
+					if ('AntAcl' === $item['_type']) {
+						$dbName = DB::getPDO()->getDatabaseName();
+						$sqlFunBody = ACL::generateIsInstanceFunctionBody($namespace, $item);
+						DBG::nicePrint($sqlFunBody, "\$sqlFunBody");
+						DB::getPDO()->execSql(" DROP FUNCTION IF EXISTS `{$dbName}`.`isInstance_{$namespace}` ");
+						// CREATE
+						//     [DEFINER = { user | CURRENT_USER }]
+						//     FUNCTION sp_name ([func_parameter[,...]])
+						//     RETURNS type
+						//     [characteristic ...] routine_body
+						DB::getPDO()->execSql("
+							CREATE DEFINER=`root`@`localhost`
+							FUNCTION `{$dbName}`.`isInstance_{$namespace}` ( pk INT(11) )
+							RETURNS TINYINT(1)
+							{$sqlFunBody}
+						");
+					}
 				}
 				return;
 			}
 
-			Lib::loadClass('Schema_SystemObjectFieldStorageAcl');
-			$objFieldAcl = new Schema_SystemObjectFieldStorageAcl();
-			$objFieldAcl->updateCache($namespace);
-
-			DBG::nicePrint([
-				'idInstance' => ACL::getInstanceId($namespace),
-				'rootInstance' => ACL::getRootNamespace($namespace),
-				'conf' => ACL::fetchInstanceConfig($namespace),
-				'table' => ACL::getInstanceTable($namespace),
-			], "dbg");
-
-			{
-				$item = SchemaFactory::loadDefaultObject('SystemObject')->getItem($namespace, [ 'propertyName' => '*,field' ]);
-				if ('AntAcl' === $item['_type']) {
-					$dbName = DB::getPDO()->getDatabaseName();
-					$sqlFunBody = ACL::generateIsInstanceFunctionBody($namespace, $item);
-					DBG::nicePrint($sqlFunBody, "\$sqlFunBody");
-					DB::getPDO()->execSql(" DROP FUNCTION IF EXISTS `{$dbName}`.`isInstance_{$namespace}` ");
-					// CREATE
-					//     [DEFINER = { user | CURRENT_USER }]
-					//     FUNCTION sp_name ([func_parameter[,...]])
-					//     RETURNS type
-					//     [characteristic ...] routine_body
-					DB::getPDO()->execSql("
-						CREATE DEFINER=`root`@`localhost`
-						FUNCTION `{$dbName}`.`isInstance_{$namespace}` ( pk INT(11) )
-						RETURNS TINYINT(1)
-						{$sqlFunBody}
-					");
-				}
+			echo UI::hButtonPost("Reinstall", [
+				'data' => [
+					'_postTask' => 'reinstall'
+				],
+				'class' => 'btn btn-md btn-danger',
+				'title' => "Reinstall structure"
+			]);
+			echo '<hr>';
+			try {
+				$this->printReinstallPreview($namespace);
+			} catch (Exception $e) {
+				DBG::log($e);
+				UI::alert('danger', $e->getMessage());
 			}
 		} catch (Exception $e) {
 			UI::alert('danger', "Error #" . $e->getCode() .  "|" . $e->getLine() .  ": " . $e->getMessage());