Skip to content

Commit

Permalink
Fix routes
Browse files Browse the repository at this point in the history
  • Loading branch information
eudaldca committed Nov 21, 2023
1 parent d1a462c commit 1bbc7f0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
1 change: 0 additions & 1 deletion src/Admin/Accions/AdminGetMain.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Omatech\Editora\Admin\Accions;

use Illuminate\Pagination\LengthAwarePaginator;
use Omatech\Editora\Admin\Models\Instances;
use Omatech\Editora\Admin\Templates\InstancesTemplate;

Expand Down
6 changes: 3 additions & 3 deletions src/Admin/Accions/AdminJoin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
namespace Omatech\Editora\Admin\Accions;

use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Session;
use Omatech\Editora\Admin\Models\Instances;
use Omatech\Editora\Admin\Models\Security;
use Illuminate\Support\Facades\Session;

class AdminJoin extends AuthController
{
Expand Down Expand Up @@ -41,8 +41,8 @@ public function render()
'params_relation' => $paramsRelation,
'count' => $count,
'paginator' => new LengthAwarePaginator($instances, $count, 40, $page,
['pageName' => 'p_pagina', 'path' => '/admin/join', 'query' => [
'p_class_id'=> $paramsRelation['class_id'],
['pageName' => 'p_pagina', 'path' => '/' . config('editora-admin.route.prefix') . '/join', 'query' => [
'p_class_id' => $paramsRelation['class_id'],
'p_inst_id' => $parent['inst_id'],
'p_relation_id' => $parent['rel_id'],
'p_parent_inst_id' => $parent['inst_id'],
Expand Down
8 changes: 4 additions & 4 deletions src/Admin/Accions/AdminListInstances.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ public function render()
'page' => $page,
'paginator' => new LengthAwarePaginator($instances, $count, 40, $page, [
'pageName' => 'p_pagina',
'path' => '/admin/list_instances',
'query' => ['p_class_id' => $class_info['id']],
]),
]);
'path' => '/' . config('editora-admin.route.prefix') . '/list_instances',
'query' => ['p_class_id' => $class_info['id']],
]),
]);

return response()->view('editora::pages.list_instances', $viewData);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/Accions/AdminSearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function render()
'status' => $params['param8'],
'class_id' => $params['param1'],
'paginator' => new LengthAwarePaginator($instances, $count, 40, $page,
['pageName' => 'p_pagina', 'path' => '/admin/search', 'query' => ['p_search_query' => $searchTerm]]),
['pageName' => 'p_pagina', 'path' => '/'.config('editora-admin.route.prefix').'/search', 'query' => ['p_search_query' => $searchTerm]]),
]);
return response()->view('editora::pages.search_instances', $viewData);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/Templates/AttributesTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ private function attribute_ckeditor($p_mode, $i, $max_height, $prefix, $row, $po
$ret = '';

if (file_exists(DIR_APLI_ADMIN.'/extras/ckeditor_config.js')) {
$ckeditor_config = ", { customConfig: '/admin/extras/ckeditor_config.js'}";
$ckeditor_config = ", { customConfig: '/extras/ckeditor_config.js'}";
}else{
$ckeditor_config = "";
}
Expand Down

0 comments on commit 1bbc7f0

Please sign in to comment.