|
@@ -93,7 +93,7 @@ class Route_UrlAction extends RouteBase {// TODO: UrlActionBase
|
|
|
$sqlIdZasob = DB::getPDO()->quote($idTbl, PDO::PARAM_STR);
|
|
$sqlIdZasob = DB::getPDO()->quote($idTbl, PDO::PARAM_STR);
|
|
|
return DB::getPDO()->fetchAll("
|
|
return DB::getPDO()->fetchAll("
|
|
|
select z.ID as ID
|
|
select z.ID as ID
|
|
|
- , z.`DESC_PL` as fun_label
|
|
|
|
|
|
|
+ , IF(z.DESC_PL != '', z.DESC_PL, IF(za.DESC_PL != '', za.DESC_PL, z.`DESC`)) as fun_label
|
|
|
, za.`DESC` as fun_name
|
|
, za.`DESC` as fun_name
|
|
|
, zp.ALIAS_ID as param_in_to_cell_id
|
|
, zp.ALIAS_ID as param_in_to_cell_id
|
|
|
, zp.DESC as param_in_name
|
|
, zp.DESC as param_in_name
|
|
@@ -111,7 +111,7 @@ class Route_UrlAction extends RouteBase {// TODO: UrlActionBase
|
|
|
$sqlUserLogin = DB::getPDO()->quote($usrLogin, PDO::PARAM_STR);
|
|
$sqlUserLogin = DB::getPDO()->quote($usrLogin, PDO::PARAM_STR);
|
|
|
return DB::getPDO()->fetchAll("
|
|
return DB::getPDO()->fetchAll("
|
|
|
select z.ID as ID
|
|
select z.ID as ID
|
|
|
- , z.`DESC_PL` as fun_label
|
|
|
|
|
|
|
+ , IF(z.DESC_PL != '', z.DESC_PL, IF(za.DESC_PL != '', za.DESC_PL, z.`DESC`)) as fun_label
|
|
|
, za.`DESC` as fun_name
|
|
, za.`DESC` as fun_name
|
|
|
, zp.ALIAS_ID as param_in_to_cell_id
|
|
, zp.ALIAS_ID as param_in_to_cell_id
|
|
|
, zp.DESC as param_in_name
|
|
, zp.DESC as param_in_name
|
