added OBJ install tables

SE/schema/gui/core/default_db-admin_users.json

@@ -1,5 +1,7 @@
 {
-  "name": "admin_users",
+  "name": "ADMIN_USERS",
+  "db_table": "ADMIN_USERS",
+  "db_source": "default_db",
   "label": "Użytkownik",
   "list_label": "Użytkownicy",
   "fields": {

SE/schema/gui/core/default_db-crm_lista_zasobow.json

@@ -1,5 +1,7 @@
 {
-  "name": "crm_lista_zasobow",
+  "name": "CRM_LISTA_ZASOBOW",
+  "db_table": "CRM_LISTA_ZASOBOW",
+  "db_source": "default_db",
   "label": "Zasób",
   "list_label": "Zasoby",
   "fields": {

SE/schema/gui/core/default_db-local_email.json

@@ -1,5 +1,7 @@
 {
-  "name": "local_email",
+  "name": "LOCAL_EMAIL",
+  "db_table": "LOCAL_EMAIL",
+  "db_source": "default_db",
   "label": "Lokalny adres email",
   "list_label": "Lokalne adresy email",
   "fields": {

SE/schema/gui/core/worker.json

@@ -18,7 +18,8 @@
           "from": "ID",
           "to": "ID_ADMIN_USERS"
         }
-      }
+      },
+      "outputSeparator": ", "
     }
   },
   "default_db_cache_fields": {

SE/se-lib/Core/Pdo.php

@@ -54,7 +54,7 @@ class Core_Pdo extends PDO {
 		$sth->bindValue(':tbl_name', $tblName, PDO::PARAM_STR);
 		$sth->execute();
 		$structRaw = $sth->fetchAll();
-		if (empty($structRaw)) throw new Exception("Empty struct for table '{$tblName}'");
+		if (empty($structRaw)) throw new Exception("Empty struct for table '{$tblName}'", 404);
 		foreach ($structRaw as $field) {
 			$struct[$field['name']] = $field;
 		}

SE/se-lib/Core/Storage/Mysql.php

@@ -57,7 +57,7 @@ class Core_Storage_Mysql extends Core_StorageBase {
 		$sth->bindValue(':tbl_name', $tblName, PDO::PARAM_STR);
 		$sth->execute();
 		$structRaw = $sth->fetchAll();
-		if (empty($structRaw)) throw new Exception("Empty struct for table '{$tblName}'");
+		if (empty($structRaw)) throw new Exception("Empty struct for table '{$tblName}'", 404);
 		foreach ($structRaw as $field) {
 			$struct[$field['name']] = $field;
 		}

SE/se-lib/Core/Storage/Pgsql.php

@@ -44,7 +44,7 @@ class Core_Storage_Pgsql extends Core_StorageBase {
 		$sth->bindValue(':tbl_name', $tblName, PDO::PARAM_STR);
 		$sth->execute();
 		$structRaw = $sth->fetchAll();
-		if (empty($structRaw)) throw new Exception("Empty struct for table '{$tblName}'");
+		if (empty($structRaw)) throw new Exception("Empty struct for table '{$tblName}'", 404);
 		foreach ($structRaw as $field) {
 			$struct[$field['name']] = $field;
 		}

SE/se-lib/OBJ.php

@@ -1,12 +1,57 @@
 <?php
 
-/**
+/*
  * json files in schema/gui/core/
  *   default_db-{tbl_name}.json - config for raw table - no 'parent_object' defined
  *   {object_name}.json - config for object - require 'parent_object' (another object or default_db-* raw table object)
+
+# Instance table:
+  `{tbl_name}__INSTANCE_CLOSURE`: `PRIMARY_KEY`, `INSTANCE`(przodek), `PARENT_INSTANCE`(przodek), `PARENT_DEPTH`(głębokość)
+
+## sql - fetch rows with instance:
+```sql
+  select t.*
+       , (select inst.INSTANCE
+          from {tbl_name}__INSTANCE_CLOSURE inst
+          where inst.PRIMARY_KEY = t.{primary_key}
+          order by inst.PARENT_DEPTH DESC limit 1) as _instance
+  from {tbl_name} t
+```
+
+## sql - fetch all
+```sql
+  select t.*
+  from {tbl_name} t
+    right join {tbl_name}__INSTANCE_CLOSURE inst on(t.{primary_key} = inst.PRIMARY_KEY)
+```
+
+# Ref tables:
+  `{tbl_name}__REF__{target_table_name}`: `PRIMARY_KEY`, `REMOTE_PRIMARY_KEY`
+
+## sql - make ref connection
+```sql
+  insert into `{tbl_name}__REF__{target_table_name}` (`PRIMARY_KEY`, `REMOTE_PRIMARY_KEY`)
+  -- TODO: save action to _HIST table
+```
+
+# Hist table:
+  `{tbl_name}__ACTIVITY_LOG`:
+  - `ID` int PRIMARY auto_increment - used in update to check conflicts
+  - `PRIMARY_KEY` - same type as root table primary key
+  - `ACTION_USER` varchar(20)
+  - `ACTION_DATE` datetime
+  - `ACTION_TYPE` enum('CREATE', 'UPDATE', 'DELETE')
+  - `LOG` text - json with action details
+  - `ERRORS` text - json with errors
+
  */
 class OBJ {
 
+  public static function getName($json) {
+    if (empty($json['name'])) throw new Exception("Struct error - name not defined in " . json_encode($json));
+    return (is_array($json['name']))? end($json['name']) : $json['name'];
+  }
+
   public static function getLabel($json) {
     if (empty($json['label'])) return null;
     return (is_array($json['label']))? end($json['label']) : $json['label'];
@@ -19,10 +64,50 @@ class OBJ {
   }
 
   public static function getFields($json) {
-    if (empty($json['fields'])) return array();
+    if (empty($json['fields'])) throw new Exception("Struct error - object has no fields");
     return $json['fields'];
   }
 
+  public static function getTableFields($json) {
+    if (empty($json['fields'])) throw new Exception("Struct error - object has no fields");
+    $fields = array();
+    foreach ($json['fields'] as $fldName => $fldConf) {
+      switch ($fldConf['type']) {
+        case 'int': $fields[] = $fldName; break;
+        case 'string': $fields[] = $fldName; break;
+        // TODO: more field types
+      }
+    }
+    return $fields;
+  }
+
+  public static function getStorageName($json) {
+    if (empty($json['db_source'])) throw new Exception("Struct error - object has no source defined");
+    return $json['db_source'];
+  }
+
+  public static function getMainTableName($json) {
+    if (empty($json['db_table'])) throw new Exception("Struct error - object has no table name defined");
+    return $json['db_table'];
+  }
+
+  public static function getPrimaryKeyType($json) {
+    // [keys] => Array(
+    //         [PRIMARY] => Array(
+    //                 [fields] => ID
+    //                 [auto_increment] => 1
+    if (empty($json['keys'])) throw new Exception("Struct error - object has no keys defined");
+    if (empty($json['keys']['PRIMARY'])) throw new Exception("Struct error - object has no PRIMARY key defined");
+    if (empty($json['keys']['PRIMARY']['fields'])) throw new Exception("Struct error - object PRIMARY key has no fields defined");
+    if (is_array($json['keys']['PRIMARY']['fields'])) throw new Exception("Not implemented - multiple fields primary key");
+    $primaryKey = $json['keys']['PRIMARY']['fields'];
+    if (empty($json['fields'][$primaryKey])) throw new Exception("Struct error - object priary key field not defined in fields list");
+    $type = V::get('type', '', $json['fields'][$primaryKey]);
+    if (empty($type)) throw new Exception("Struct error - object primary field type not defined");
+    if ('int' != $type) throw new Exception("Not implemented - primary key field type is no int");
+    return $type;
+  }
+
   public static function getCoreObjectFromFile($objectName) {
 		$objectFileName = str_replace("/", '-', $objectName);
 		$filePath = APP_PATH_SCHEMA . "/gui/core/{$objectFileName}.json";
@@ -53,4 +138,174 @@ class OBJ {
     return $objectList;
   }
 
+  public static function checkInstall($json) {
+    self::checkInstanceTable($json);
+    self::checkRefTables($json);
+    self::checkActivityLogTable($json);
+  }
+
+  public static function checkInstanceTable($json) {
+    $mainTableName = self::getMainTableName($json);
+    $instanceTableName = "{$mainTableName}__INSTANCE_CLOSURE";
+    $primaryKeyType = "int(11)";// TODO: fetch from main table - default int(11)
+
+    $storageName = self::getStorageName($json);
+    $storagePdo = DB::getStorage($storageName);
+    try {
+      $mainTableStruct = $storagePdo->getTableStruct($mainTableName);
+    } catch (Exception $e) {
+      throw $e;
+      // TODO: if (404 != $e->getCode()) -> CREATE BASE TABLE -- mv to TODO: checkMainTableInstall($json)
+    }
+    try {
+      $instanceTableStruct = DB::getStorage()->getTableStruct($instanceTableName);
+    } catch (Exception $e) {
+      if (404 != $e->getCode()) throw $e;
+      $instanceTableStruct = null;
+    }
+
+    $sqlCreate = "
+      CREATE TABLE IF NOT EXISTS `{$instanceTableName}` (
+        `PRIMARY_KEY` {$primaryKeyType} NOT NULL,
+        `INSTANCE` varchar(124) NOT NULL,
+        `PARENT_INSTANCE` varchar(124) DEFAULT NULL,
+        `PARENT_DEPTH` int(11) NOT NULL,
+        KEY `PRIMARY_KEY` (`PRIMARY_KEY`)
+      ) ENGINE=MyISAM DEFAULT CHARSET=latin2
+    ";
+    DBG::_('DBG', '>2', "mainTableStruct", $mainTableStruct, __CLASS__, __FUNCTION__, __LINE__);
+    DBG::_('DBG', '>2', "instanceTableStruct", $instanceTableStruct, __CLASS__, __FUNCTION__, __LINE__);
+    DBG::_('DBG', '>2', "sqlCreate", $sqlCreate, __CLASS__, __FUNCTION__, __LINE__);
+
+    if (!$instanceTableStruct) {
+      DB::getPDO()->exec($sqlCreate);
+    }
+    try {
+      $instanceTableStruct = DB::getStorage()->getTableStruct($instanceTableName);
+    } catch (Exception $e) {
+      throw new Exception("Wystąpiły błędy podczas tworzenie tabeli instancji dla {$mainTableName}");
+    }
+    DBG::_('DBG', '>2', "OK instance table exists - instanceTableStruct", $instanceTableStruct, __CLASS__, __FUNCTION__, __LINE__);
+  }
+  public static function checkRefTables($json) {
+    // TODO: should go recurse or create on demand? - create on demand
+    $objectName = self::getName($json);
+    $mainTableName = self::getMainTableName($json);
+    $objectPrimaryKeyType = self::getPrimaryKeyType($json);
+    if (empty($json['fields'])) return;
+    $toCreateRefTables = array();// ref table name => target primary key type
+    foreach ($json['fields'] as $fldName => $fld) {
+      if ('ref' != V::get('type', '', $fld)) continue;
+      // [ref_LOCAL_EMAIL] => Array(
+      //     [label] => Adresy email lokalnej poczty
+      //     [type] => ref
+      //     [ref_config] => Array(
+      //             [name] => user__ref__local_email
+      //             [target] => local_email
+      $refConf = V::get('ref_config', '', $fld);
+      if (!$refConf) throw new Exception("Struct error - ref config not defined for field {$objectName}/{$fldName}");
+      $refTarget = V::get('target', '', $refConf);
+      if (!$refConf) throw new Exception("Struct error - ref target not defined for field {$objectName}/{$fldName}");
+      $jsonTarget = OBJ::getCoreObjectFromFile($refTarget);
+      $targetMainTableName = self::getMainTableName($jsonTarget);
+      $refTableName = "{$mainTableName}__REF__{$targetMainTableName}";
+      $targetPrimaryKeyType = self::getPrimaryKeyType($jsonTarget);
+      DBG::_('DBG', '>1', "create table `{$refTableName}` ( `PRIMARY_KEY` {$objectPrimaryKeyType}, `REMOTE_PRIMARY_KEY` {$targetPrimaryKeyType}) ", null, __CLASS__, __FUNCTION__, __LINE__);
+      $toCreateRefTables[ $refTableName ] = $targetPrimaryKeyType;
+    }
+    foreach ($toCreateRefTables as $refTableName => $targetPrimaryKeyType) {
+      // `{tbl_name}__REF__{target_table_name}`: `PRIMARY_KEY`, `REMOTE_PRIMARY_KEY`
+      $sqlCreate = "
+        CREATE TABLE IF NOT EXISTS `{$refTableName}` (
+          `PRIMARY_KEY` {$objectPrimaryKeyType} NOT NULL,
+          `REMOTE_PRIMARY_KEY` {$targetPrimaryKeyType} NOT NULL,
+          KEY `PRIMARY_KEY` (`PRIMARY_KEY`),
+          KEY `REMOTE_PRIMARY_KEY` (`REMOTE_PRIMARY_KEY`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=latin2
+      ";
+      DB::getPDO()->exec($sqlCreate);
+      try {
+        $refTableStruct = DB::getStorage()->getTableStruct($refTableName);
+      } catch (Exception $e) {
+        throw new Exception("Wystąpiły błędy podczas tworzenie tabeli ref {$refTableName}");
+      }
+    }
+  }
+  public static function checkActivityLogTable($json) {
+    // `{tbl_name}__ACTIVITY_LOG`:
+    // - `ID` int PRIMARY auto_increment - used in update to check conflicts
+    // - `PRIMARY_KEY` - same type as root table primary key
+    // - `ACTION_USER` varchar(20)
+    // - `ACTION_DATE` datetime
+    // - `ACTION_TYPE` enum('CREATE', 'UPDATE', 'DELETE')
+    // - `LOG` text - json with action details
+    // - `ERRORS` text - json with errors
+    $mainTableName = self::getMainTableName($json);
+    $histTableName = "{$mainTableName}__ACTIVITY_LOG";
+    $primaryKeyType = self::getPrimaryKeyType($json);// default "int";
+
+    $storageName = self::getStorageName($json);
+    $storagePdo = DB::getStorage($storageName);
+    $mainTableStruct = $storagePdo->getTableStruct($mainTableName);
+    try {
+      $histTableStruct = DB::getStorage()->getTableStruct($histTableName);
+    } catch (Exception $e) {
+      if (404 != $e->getCode()) throw $e;
+      $histTableStruct = null;
+    }
+
+    $sqlCreate = "
+      CREATE TABLE IF NOT EXISTS `{$histTableName}` (
+        `ID` int(11) NOT NULL AUTO_INCREMENT,
+        `PRIMARY_KEY` {$primaryKeyType} NOT NULL,
+        `ACTION_USER` varchar(20) NOT NULL,
+        `ACTION_DATE` datetime NOT NULL,
+        `ACTION_TYPE` enum('CREATE','UPDATE','DELETE') NOT NULL,
+        `LOG` text NOT NULL,
+        `ERRORS` text NOT NULL,
+        PRIMARY KEY (`ID`),
+        KEY `PRIMARY_KEY` (`PRIMARY_KEY`)
+      ) ENGINE=MyISAM DEFAULT CHARSET=latin2
+    ";
+    DBG::_('DBG', '>2', "mainTableStruct", $mainTableStruct, __CLASS__, __FUNCTION__, __LINE__);
+    DBG::_('DBG', '>2', "instanceTableStruct", $histTableStruct, __CLASS__, __FUNCTION__, __LINE__);
+    DBG::_('DBG', '>2', "sqlCreate", $sqlCreate, __CLASS__, __FUNCTION__, __LINE__);
+
+    if (!$histTableStruct) {
+      DB::getPDO()->exec($sqlCreate);
+    }
+    try {
+      $histTableStruct = DB::getStorage()->getTableStruct($histTableName);
+    } catch (Exception $e) {
+      throw new Exception("Wystąpiły błędy podczas tworzenie tabeli hist dla {$mainTableName}");
+    }
+    DBG::_('DBG', '>2', "OK hist table exists - histTableStruct", $histTableStruct, __CLASS__, __FUNCTION__, __LINE__);
+  }
+
+  public static function parseAll() {
+    DBG::activate();
+    $mapInheritance = array();
+    $objList = self::getCoreObjectList();
+    foreach ($objList as $objName) {
+      $json = self::getCoreObjectFromFile($objName);
+      $parentList = OBJ::getParentList($json);
+      DBG::_(true, true, "obj({$objName}) parentList:", $parentList, __CLASS__, __FUNCTION__, __LINE__);
+      if (!empty($parentList)) {
+        /*
+          obj(stanowisko) parentList = Array(
+              [0] => group
+              [1] => zasob
+              [2] => default_db/crm_lista_zasobow
+        */
+        $rootTable = array_pop($parentList);
+        if (!array_key_exists($rootTable, $mapInheritance)) $mapInheritance[$rootTable] = array();
+        array_unshift($parentList, $objName);
+        foreach ($parentList as $parentName) {
+          if (!in_array($parentName, $mapInheritance[$rootTable])) $mapInheritance[$rootTable][] = $parentName;
+        }
+      }
+      DBG::_(true, true, "mapInheritance:", $mapInheritance, __CLASS__, __FUNCTION__, __LINE__);
+    }
+  }
+
 }

SE/se-lib/Route/Storage.php

@@ -50,7 +50,7 @@ class Route_Storage extends RouteBase {
 				$menuItem['typ'] = 'OBJECTS';
 				$menuItem['tabele i widoki'] = '<a href="index.php?_route=Storage&_task=coreObjectList">' . "obiekty" . '</a>';
 				//$menuItem['views'] = '<a href="index.php?_route=Storage&_task=viewList&idStorage=' . $id . '">' . "views" . '</a>';
-				//$menuItem['raw info'] = '<a href="index.php?_route=Storage&_task=objectRawInfo">' . "raw info" . '</a>';
+				$menuItem['raw info'] = '<a href="index.php?_route=Storage&_task=coreObjectParseAll">' . "parse All" . '</a>';
 				// TODO: $menuItem['xsd'] = '<a href="index.php?_route=Storage&_task=xsd&idStorage=' . $id . '" target="_blank">' . "xsd" . '</a>';
 				$storageMenu[] = $menuItem;
 			}
@@ -74,26 +74,64 @@ class Route_Storage extends RouteBase {
 		UI::dol();
 	}
 
+	public function checkObjectInstallAjaxAction() {
+		$response = array();
+
+		try {
+			$objectName = V::get('object', '', $_REQUEST, 'word');
+			if (empty($objectName)) throw new Exception("Missing Object name");
+			$response['object'] = $objectName;
+			$json = OBJ::getCoreObjectFromFile($objectName);
+
+			OBJ::checkInstall($json);
+
+			$response['type'] = 'success';
+			$response['msg'] = "OK - object installed";
+		} catch (Exception $e) {
+			$response['type'] = 'error';
+			$response['msg'] = $e->getMessage();
+			$response['code'] = $e->getCode();
+			$response['line'] = $e->getLine();
+		}
+		Response::sendJsonExit($response);
+	}
+
 	public function coreObjectStructAction() {
 		UI::gora();
 		UI::menu();
 		$this->navView();
 		try {
 
-			$object = V::get('object', '', $_REQUEST, 'word');
-			if (empty($object)) throw new Exception("Missing Object name");
-			$json = OBJ::getCoreObjectFromFile($object);
+			$objectName = V::get('object', '', $_REQUEST, 'word');
+			if (empty($objectName)) throw new Exception("Missing Object name");
+			$json = OBJ::getCoreObjectFromFile($objectName);
 
 			$label = OBJ::getLabel($json);
 			$parentList = OBJ::getParentList($json);
+			$linksParentList = array(); foreach ($parentList as $parentName) {
+				$parentLink = '<a href="index.php?_route=Storage&_task=coreObjectStruct&object=' . str_replace('/', '-', $parentName) . '">' . $parentName . '</a>';
+				array_unshift($linksParentList, $parentLink);
+			}
+
+			$ajaxCheckInstall = Request::getPathUri() . "index.php?_route=Storage&_task=checkObjectInstallAjax&object={$objectName}";
+			$onClick = "return p5UI__ButtonAjax(this, 'p5UIBtnAjax:Storage:checkObjectInstallAjax', { href: '{$ajaxCheckInstall}' })";
+			$btnCheckInstall = '<a onclick="'.$onClick.'" href="#" title="check install db tables"><i class="glyphicon glyphicon-cog"></i></a>';
+
 ?>
 <div class="container">
-	<h1>Obiekt <code><?php echo $label; ?></code></h1>
+	<h1>Obiekt <code><?php echo $label; ?></code> <small><?php echo $btnCheckInstall; ?></small></h1>
 	<?php if (!empty($parentList)) : ?>
-		<p>Dziedziczy z: <?php echo implode(", ", $parentList); ?></p>
+		<ol class="breadcrumb">
+		  <li>Dziedziczy z:</li>
+			<?php foreach ($linksParentList as $parentLink) : ?>
+			  <li><?php echo $parentLink; ?></li>
+			<?php endforeach; ?>
+		  <!-- <li class="active">Data</li> -->
+		</ol>
+		<!-- <p> <?php echo implode(", ", $parentList); ?></p> -->
 	<?php endif; ?>
-	Struktura:
 	<table class="table table-bordered table-hovered">
+		<caption>Struktura:</caption>
 		<thead>
 			<tr>
 				<th>nazwa</th>
@@ -113,10 +151,60 @@ class Route_Storage extends RouteBase {
 			<?php endforeach; ?>
 		</tbody>
 	</table>
+	<div class="btn-group">
+		<button class="btn btn-default" title="Wybierz rekordy wg instancji"><i class="glyphicon glyphicon-question-sign"></i></button>
+		<button class="btn btn-default">Przypisani</button>
+		<button class="btn btn-default">Nieprzypisani</button>
+	</div>
+	<?php
+		$mainTable = OBJ::getMainTableName($json);
+		$sqlFields = OBJ::getTableFields($json);
+		$this->showTableWidet($mainTable, $sqlFields);
+
+		echo 'DBG exec "'."select count(*) from {$mainTable}".'"(' . DB::getPDO()->exec("select count(*) from {$mainTable}") . ')';// TODO: TEST
+	?>
 </div>
+<script>
+jQuery(document).on('p5UIBtnAjax:Storage:checkObjectInstallAjax:click', function(e, n, payload) {
+	console.log('event p5UIBtnAjax:Storage:checkObjectInstallAjax:click', n, payload);
+});
+jQuery(document).on('p5UIBtnAjax:Storage:checkObjectInstallAjax:ajaxLoaded', function(e, n, payload) {
+	console.log('event p5UIBtnAjax:Storage:checkObjectInstallAjax:ajaxLoaded', n, payload);
+	if ('success' == payload.type) {
+		// jQuery(n).parents('td').text(payload.body.id);
+	}
+	jQuery.notify(payload.msg, payload.type);
+});
+</script>
 <?php
 			DBG::_(true, true, "json", $json, __CLASS__, __FUNCTION__, __LINE__);
+		} catch (Exception $e) {
+			UI::alert('danger', "Error #" . $e->getCode() .  "|" . $e->getLine() .  ": " . $e->getMessage());
+		}
+		UI::dol();
+	}
 
+	public function showTableWidet($tblName, $fields) {
+		$sqlFields = array();
+		foreach ($fields as $fldName) {
+			$sqlFields[] = "t.`{$fldName}`";
+		}
+		$sqlFields = (!empty($sqlFields))? implode(", ", $sqlFields) : "t.*";
+		$rows = DB::getPDO()->fetchAll("
+			select {$sqlFields}
+			from `{$tblName}` t
+			where 1=1
+			limit 10
+		");
+		DBG::table("table({$tblName})", $rows, __CLASS__, __FUNCTION__, __LINE__);
+	}
+
+	public function coreObjectParseAllAction() {
+		UI::gora();
+		UI::menu();
+		$this->navView();
+		try {
+			OBJ::parseAll();
 		} catch (Exception $e) {
 			UI::alert('danger', "Error #" . $e->getCode() .  "|" . $e->getLine() .  ": " . $e->getMessage());
 		}
@@ -133,8 +221,8 @@ class Route_Storage extends RouteBase {
 			foreach ($coreObjlist as $objName) {
 				$objItem = array();
 				$objItem['name'] = $objName;
-				$objItem['label'] = "";// TODO: read from json
 				$objItem['struktura'] = '<a href="index.php?_route=Storage&_task=coreObjectStruct&object=' . $objName . '">' . "struct" . '</a>';
+				// $objItem['label'] = "";// TODO: read from json
 				$objectList[] = $objItem;
 			}
 			usort($objectList, function($rowA, $rowB) {
@@ -211,7 +299,7 @@ class Route_Storage extends RouteBase {
 					$tblItem['id_zasob'] = $tblZasob['ID'];
 				} else {
 					$tblItem['uwagi'] .= 'TODO: ADD ZASOB';
-					$ajaxAddZasobLink = Request::getUriDirName() . "/index.php?_route=Storage&_task=addTableToZasoby&idStorage={$idStorage}&tblName={$tblName}";
+					$ajaxAddZasobLink = Request::getPathUri() . "index.php?_route=Storage&_task=addTableToZasoby&idStorage={$idStorage}&tblName={$tblName}";
 					$onClick = "return p5UI__ButtonAjax(this, 'p5UIBtnAjax:Storage:addToZasoby', { href: '{$ajaxAddZasobLink}' })";
 					$tblItem['id_zasob'] = '<a onclick="'.$onClick.'" class="btn btn-xs btn-primary" href="#">TODO: ADD ZASOB</a>';
 				}
@@ -359,7 +447,7 @@ jQuery(document).on('p5UIBtnAjax:Storage:addToZasoby:ajaxLoaded', function(e, n,
 					$tblItem['id_zasob'] = $tblZasob['ID'];
 				} else {
 					$tblItem['uwagi'] .= '!Zasob';//'TODO: ADD ZASOB';
-					$ajaxAddZasobLink = Request::getUriDirName() . "/index.php?_route=Storage&_task=addCellToZasoby&idStorage={$idStorage}&tblName={$tblName}&cellName={$cellName}";
+					$ajaxAddZasobLink = Request::getPathUri() . "index.php?_route=Storage&_task=addCellToZasoby&idStorage={$idStorage}&tblName={$tblName}&cellName={$cellName}";
 					$onClick = "return p5UI__ButtonAjax(this, 'p5UIBtnAjax:Storage:addToZasoby', { href: '{$ajaxAddZasobLink}' })";
 					$tblItem['id_zasob'] = '<a onclick="'.$onClick.'" class="btn btn-xs btn-primary" href="#">TODO: ADD ZASOB</a>';
 				}