Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ProcessMaker/Http/Controllers/Process/ScreenController.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ public function index(Request $request)
'countCategories' => ScreenCategory::where(['status' => 'ACTIVE', 'is_system' => false])->count(),
];

return view('processes.screens.index', compact('listConfig', 'catConfig'));
$myScreenTemplates = (object) [

];

return view('processes.screens.index', compact('listConfig', 'catConfig', 'myScreenTemplates'));
}

/**
Expand Down
53 changes: 48 additions & 5 deletions resources/views/components/categorized_resource.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,21 @@
</a>
</li>
@endisset
@elseif (isset($myScreenTemplates))
@if ($catConfig->permissions['view'])
<li class="nav-item">
<a class="nav-item nav-link" id="nav-categories-tab" data-toggle="tab" href="#nav-categories"
role="tab" onclick="loadCategory()" aria-controls="nav-categories" aria-selected="true">
{{ $tabs[1] ?? __('Categories') }}
</a>
</li>
@endif
<li class="nav-item">
<a class="{{$secondTab}}" id="nav-myTemplates-tab" data-toggle="tab" href="#nav-myTemplates"
role="tab" onclick="loadMyTemplates()" aria-controls="nav-myTemplates" aria-selected="true">
{{ $tabs[2] ?? __('My Templates') }}
</a>
</li>
@else
@if ($catConfig->permissions['view'] && $catConfig->routes->itemsIndexWeb !== "data-sources.index")
<li class="nav-item">
Expand Down Expand Up @@ -105,10 +120,15 @@
</div>
</div>
@endcan
<div class="{{$secondContent}}" id="nav-categories" role="tabpanel" aria-labelledby="nav-categories-tab">
<div class="card card-body p-3 border-top-0">
{{ $categoryList }}
</div>
<div
class="{{$secondContent}}"
id="nav-categories"
role="tabpanel"
aria-labelledby="nav-categories-tab"
>
<div class="card card-body p-3 border-top-0">
{{ $categoryList }}
</div>
</div>
@isset($tabs[3])
<div class="tab-pane fade" id="nav-archived" role="tabpanel" aria-labelledby="nav-archived-tab">
Expand All @@ -117,8 +137,31 @@
</div>
</div>
@endisset
@elseif(isset($myScreenTemplates))
<div
class="{{$secondContent}}"
id="nav-categories"
role="tabpanel"
aria-labelledby="nav-categories-tab"
>
<div class="card card-body p-3 border-top-0">
{{ $categoryList }}
</div>
</div>
@isset($tabs[3])
<div class="tab-pane fade" id="nav-myTemplates" role="tabpanel" aria-labelledby="nav-myTemplates-tab">
<div class="card card-body p-3 border-top-0">
{{ $myTemplatesList }}
</div>
</div>
@endisset
@else
<div class="{{$secondContent}}" id="nav-categories" role="tabpanel" aria-labelledby="nav-categories-tab">
<div
class="{{$secondContent}}"
id="nav-categories"
role="tabpanel"
aria-labelledby="nav-categories-tab"
>
<div class="card card-body p-3 border-top-0">
{{ $categoryList }}
</div>
Expand Down
9 changes: 8 additions & 1 deletion resources/views/processes/screens/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
'tabs' => [
__('Screens'),
__('Categories'),
__('My Templates'),
],
'listConfig' => $listConfig,
'catConfig' => $catConfig
'catConfig' => $catConfig,
'myScreenTemplates' => $myScreenTemplates,
])
@slot('itemList')
@component('processes.screens.list', ['config' => $listConfig])
Expand All @@ -33,6 +35,11 @@
@component('categories.list', ['config' => $catConfig])
@endcomponent
@endslot

@slot('myTemplatesList')
@component('processes.screens.myTemplates', ['config' => $myScreenTemplates])
@endcomponent
@endslot
@endcomponent
@endsection

Expand Down
Empty file.