From d675c085d35dd32d3afd2a2de1e5705aadc586c0 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Mon, 23 Dec 2013 17:38:43 +0200 Subject: [PATCH] move routes.json to 'Resources' --- application/Espo/Core/Utils/Route.php | 4 ++-- application/Espo/Modules/Crm/Resources/routes.json | 2 ++ application/Espo/Modules/Crm/routes.json | 2 -- application/Espo/{ => Resources}/routes.json | 0 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 application/Espo/Modules/Crm/Resources/routes.json delete mode 100644 application/Espo/Modules/Crm/routes.json rename application/Espo/{ => Resources}/routes.json (100%) diff --git a/application/Espo/Core/Utils/Route.php b/application/Espo/Core/Utils/Route.php index 1b70ce1ea4..1fa8d7a5b6 100644 --- a/application/Espo/Core/Utils/Route.php +++ b/application/Espo/Core/Utils/Route.php @@ -90,14 +90,14 @@ class Route foreach($dirList as $currentDirName) { $dirNameFull = Util::concatPath($moduleDir, $currentDirName); - $routeFile = Util::concatPath($dirNameFull, $this->fileName); + $routeFile = Util::concatPath($dirNameFull, 'Resources/'.$this->fileName); $data = $this->getAddData($data, $routeFile); } } //if need this path to high priority, move up this code - $routeFile = Util::concatPath('application/Espo'.$dirName, $this->fileName); + $routeFile = Util::concatPath('application/Espo'.$dirName.'/Resources', $this->fileName); $data = $this->getAddData($data, $routeFile); if (!$isCustom) { diff --git a/application/Espo/Modules/Crm/Resources/routes.json b/application/Espo/Modules/Crm/Resources/routes.json new file mode 100644 index 0000000000..32960f8ced --- /dev/null +++ b/application/Espo/Modules/Crm/Resources/routes.json @@ -0,0 +1,2 @@ +[ +] \ No newline at end of file diff --git a/application/Espo/Modules/Crm/routes.json b/application/Espo/Modules/Crm/routes.json deleted file mode 100644 index ad5f28065c..0000000000 --- a/application/Espo/Modules/Crm/routes.json +++ /dev/null @@ -1,2 +0,0 @@ -[ -] \ No newline at end of file diff --git a/application/Espo/routes.json b/application/Espo/Resources/routes.json similarity index 100% rename from application/Espo/routes.json rename to application/Espo/Resources/routes.json