Skip to content

Commit b761923

Browse files
author
dante
committed
Cleaning unused variables and change for more meaningful names
1 parent 9852a08 commit b761923

13 files changed

Lines changed: 47 additions & 63 deletions

File tree

‎ProcessMaker/Http/Controllers/Process/ProcessCategoryController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public function edit(ProcessCategory $processCategory)
2020
$category = $processCategory;
2121
$route = 'process_categories';
2222
$location = '/designer/processes/categories';
23-
$titleMenu = __('Categories');
24-
$routeMenu = 'categories.index';
23+
$categoriesLabel = __('Categories');
24+
$itemsLabel = __('Processes');
25+
$categoriesRoute = 'process-categories.index';
2526
$itemsRoute = 'processes.index';
26-
$itemsTitle = __('Processes');
27-
return view('categories.edit', compact('category', 'route', 'location', 'titleMenu', 'routeMenu', 'itemsRoute', 'itemsTitle'));
27+
return view('categories.edit', compact('category', 'route', 'location', 'categoriesLabel', 'categoriesRoute', 'itemsRoute', 'itemsLabel'));
2828
}
2929
}

‎ProcessMaker/Http/Controllers/Process/ScreenCategoryController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ class ScreenCategoryController extends Controller
1818
public function edit(ScreenCategory $screenCategory)
1919
{
2020
$category = $screenCategory;
21-
$titleMenu = __('Categories');
22-
$routeMenu = 'screen-categories.index';
21+
$categoriesLabel = __('Categories');
22+
$itemsLabel = __('Screens');
23+
$categoriesRoute = 'screen-categories.index';
2324
$route = 'screen_categories';
2425
$location = '/designer/screens/categories';
2526
$itemsRoute = 'screens.index';
26-
$itemsTitle = __('Screens');
27-
return view('categories.edit', compact('category', 'route', 'location', 'titleMenu', 'routeMenu', 'itemsRoute', 'itemsTitle'));
27+
return view('categories.edit', compact('category', 'route', 'location', 'categoriesLabel', 'categoriesRoute', 'itemsRoute', 'itemsLabel'));
2828
}
2929
}

‎ProcessMaker/Http/Controllers/Process/ScreenController.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,16 @@ public function index()
2929

3030
$catConfig = (object) [
3131
'labels' => (object) [
32-
'titleMenu' => __('Screens'),
33-
'titleModal' => __('Create Screen Category'),
32+
'newCategoryTitle' => __('Create Screen Category'),
3433
'countColumn' => __('# Screens'),
3534
],
3635
'routes' => (object) [
37-
'routeMenu' => 'screens.index',
38-
'route' => 'screen_categories',
39-
'location' => '/designer/screens/categories',
36+
'itemsIndexWeb' => 'screens.index',
37+
'editCategoryWeb' => 'screen-categories.edit',
38+
'categoryListApi' => 'api.screen_categories.index',
4039
],
4140
'countField' => 'screens_count',
4241
'apiListInclude' => 'screensCount',
43-
'permissions' => Auth::user()->hasPermissionsFor('categories')
4442
];
4543

4644
$listConfig = (object) [

‎ProcessMaker/Http/Controllers/Process/ScriptCategoryController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ class ScriptCategoryController extends Controller
1919
public function edit(ScriptCategory $scriptCategory)
2020
{
2121
$category = $scriptCategory;
22-
$titleMenu = __('Categories');
23-
$routeMenu = 'script-categories.index';
22+
$categoriesLabel = __('Categories');
23+
$itemsLabel = __('Scripts');
24+
$categoriesRoute = 'script-categories.index';
2425
$route = 'script_categories';
2526
$location = '/designer/scripts/categories';
2627
$itemsRoute = 'scripts.index';
27-
$itemsTitle = __('Scripts');
28-
return view('categories.edit', compact('category', 'route', 'location', 'titleMenu', 'routeMenu', 'itemsRoute', 'itemsTitle'));
28+
return view('categories.edit', compact('category', 'route', 'location', 'categoriesLabel', 'categoriesRoute', 'itemsRoute', 'itemsLabel'));
2929
}
3030
}

‎ProcessMaker/Http/Controllers/Process/ScriptController.php‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,16 @@ public function index()
1919
{
2020
$catConfig = (object) [
2121
'labels' => (object) [
22-
'titleMenu' => __('Scripts'),
23-
'titleModal' => __('Create Script Category'),
22+
'newCategoryTitle' => __('Create Script Category'),
2423
'countColumn' => __('# Scripts'),
2524
],
2625
'routes' => (object) [
27-
'routeMenu' => 'scripts.index',
28-
'route' => 'script_categories',
29-
'location' => '/designer/scripts/categories',
26+
'itemsIndexWeb' => 'scripts.index',
27+
'editCategoryWeb' => 'script-categories.edit',
28+
'categoryListApi' => 'api.script_categories.index',
3029
],
3130
'countField' => 'scripts_count',
3231
'apiListInclude' => 'scriptsCount',
33-
'permissions' => Auth::user()->hasPermissionsFor('categories')
3432
];
3533

3634
$listConfig = (object) [
@@ -39,22 +37,6 @@ public function index()
3937
];
4038

4139
return view('processes.scripts.index', compact ('listConfig', 'catConfig'));
42-
43-
// $scriptFormats = Script::scriptFormatList();
44-
// $countCategories = ScriptCategory::where(['status' => 'ACTIVE', 'is_system' => false])->count();
45-
// $titleMenu = __('Scripts');
46-
// $routeMenu = 'scripts.index';
47-
// $titleModal = __('Create Category');
48-
// $permissions = Auth::user()->hasPermissionsFor('categories');
49-
// $route = 'script_categories';
50-
// $location = '/designer/scripts/categories';
51-
// $include = 'scriptsCount';
52-
// $labelCount = __('# Scripts');
53-
// $count = 'scripts_count';
54-
// $showCategoriesTab = 'script-categories.index' === \Request::route()->getName() || $countCategories === 0 ? true : false;
55-
//
56-
// return view('processes.scripts.index', compact('scriptFormats', 'countCategories', 'titleMenu', 'routeMenu',
57-
// 'permissions', 'titleModal', 'route', 'location', 'include', 'labelCount', 'count', 'showCategoriesTab'));
5840
}
5941

6042
public function edit(Script $script, User $users)

‎ProcessMaker/Http/Controllers/ProcessController.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,16 @@ public function index(Request $request)
4141

4242
$catConfig = (object) [
4343
'labels' => (object) [
44-
'titleMenu' => __('Processes'),
45-
'titleModal' => __('Create Process Category'),
44+
'newCategoryTitle' => __('Create Process Category'),
4645
'countColumn' => __('# Processes'),
4746
],
4847
'routes' => (object) [
49-
'routeMenu' => 'processes.index',
50-
'route' => 'process_categories',
51-
'location' => '/designer/processes/categories',
48+
'itemsIndexWeb' => 'processes.index',
49+
'editCategoryWeb' => 'process-categories.edit',
50+
'categoryListApi' => 'api.process_categories.index',
5251
],
5352
'countField' => 'processes_count',
5453
'apiListInclude' => 'processesCount',
55-
'permissions' => Auth::user()->hasPermissionsFor('categories')
5654
];
5755

5856
$listConfig = (object) [

‎resources/views/categories/edit.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
@section('breadcrumbs')
1212
@include('shared.breadcrumbs', ['routes' => [
1313
__('Designer') => route('processes.index'),
14-
$itemsTitle => route($itemsRoute),
15-
$titleMenu => route($routeMenu),
14+
$itemsLabel => route($itemsRoute),
15+
$categoriesLabel => route($categoriesRoute),
1616
__('Edit') . " " . $category->name => null,
1717
]])
1818
@endsection

‎resources/views/categories/list.blade.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
@php
2+
$url = app('router')->getRoutes()->getByName($config->routes->editCategoryWeb)->uri;
3+
$editCatBaseUrl = '/' . explode('categories', $url)[0] . 'categories';
4+
@endphp
15
<div class="px-3 page-content" id="categories-listing">
26
<div id="search-bar" class="search mt-2 bg-light" vcloak>
37
<div class="d-flex">
@@ -25,9 +29,9 @@
2529
@reload="reload"
2630
:filter="filter"
2731
:permission="{{ \Auth::user()->hasPermissionsFor('categories') }}"
28-
api-route="{{$config->routes->route}}"
32+
api-route="{{route($config->routes->categoryListApi)}}"
2933
load-on-start="{{$config->showCategoriesTab ?? true}}"
30-
location="{{$config->routes->location}}"
34+
location="{{$editCatBaseUrl}}"
3135
include="{{$config->apiListInclude}}"
3236
label-count="{{$config->labels->countColumn}}"
3337
count="{{$config->countField}}">
@@ -39,7 +43,7 @@
3943
<div class="modal-dialog modal-dialog-centered" role="document">
4044
<div class="modal-content">
4145
<div class="modal-header">
42-
<h5 class="modal-title">{{ $config->labels->titleModal ?? __('Create Category')}}</h5>
46+
<h5 class="modal-title">{{ $config->labels->newCategoryTitle ?? __('Create Category')}}</h5>
4347
<button type="button" class="close" data-dismiss="modal" aria-label="Close" @click="onClose">
4448
<span aria-hidden="true">&times;</span>
4549
</button>
@@ -87,8 +91,8 @@
8791
name: "",
8892
status: "ACTIVE",
8993
disabled: false,
90-
route: @json($config->routes->route),
91-
location: @json($config->routes->location),
94+
route: @json(route($config->routes->categoryListApi)),
95+
location: @json($editCatBaseUrl),
9296
},
9397
methods: {
9498
onClose () {

‎resources/views/components/categorized_resource.blade.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
@php
33
$firstTab = $secondTab = 'nav-item nav-link';
44
$firstContent = $secondContent = 'tab-pane fade show';
5-
$showCategoriesTab = 'categories.index' === \Request::route()->getName() || $countCategories === 0
5+
6+
$catListWebRoute = str_replace_last('.edit', '.index', $catConfig->routes->editCategoryWeb);
7+
$showCategoriesTab = $catListWebRoute === \Request::route()->getName() || $listConfig->countCategories === 0
68
? true
79
: false;
810
@@ -50,6 +52,6 @@
5052
loadCategory = function () {
5153
ProcessMaker.EventBus.$emit("api-data-category", true);
5254
};
53-
if ({{$countCategories}} === 0) loadCategory();
55+
if ({{$listConfig->countCategories}} === 0) loadCategory();
5456
</script>
5557
@append

‎resources/views/processes/index.blade.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
__('Processes'),
3030
__('Categories'),
3131
],
32-
'countCategories' => $listConfig->countCategories,
32+
'listConfig' => $listConfig,
33+
'catConfig' => $catConfig,
3334
])
3435
@slot('itemList')
3536
@component('processes.list', ['config' => $listConfig])

0 commit comments

Comments
 (0)