Skip to content

Commit f9c7bb2

Browse files
committed
display project namespaces
1 parent 0f6897b commit f9c7bb2

File tree

6 files changed

+26
-17
lines changed

6 files changed

+26
-17
lines changed

app/Http/Controllers/IssueController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function prepareDataForIndex(FormRequest $request, array $data)
4141
$data,
4242
[
4343
'assigneeList' => $contributorRepository->getItemsForSelect(),
44-
'projectsList' => $projectRepository->getItemsForSelect(),
44+
'projectsList' => $projectRepository->getItemsForSelect(null, null, 'id', 'path_with_namespace'),
4545
'labelList' => $labelRepository->getItemsForSelect(null, null, 'name'),
4646
'milestoneList' => $milestoneRepository->getItemsForSelect(null, null, 'id', 'title'),
4747
'total' => [

app/Http/Controllers/TimeController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected function prepareDataForIndex(FormRequest $request, array $data)
5858
$data,
5959
[
6060
'authorsList' => $contributorRepository->getItemsForSelect(),
61-
'projectsList' => $projectRepository->getItemsForSelect(),
61+
'projectsList' => $projectRepository->getItemsForSelect(null, null, 'id', 'path_with_namespace'),
6262
'labelList' => $labelRepository->getItemsForSelect(null, null, 'name'),
6363
'milestoneList' => $milestoneRepository->getItemsForSelect(null, null, 'id', 'title'),
6464
'total' => [

resources/lang/en/messages.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,5 @@
9393
'of' => 'of',
9494
'Logout' => 'Logout',
9595
'Act t&m/labels CSV' => 'Act t&m/labels CSV',
96+
'Domain' => 'Domain',
9697
];

resources/lang/ru/messages.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,5 @@
9393
'of' => 'из',
9494
'Logout' => 'Выход',
9595
'Act t&m/labels CSV' => 'Акт t&m/метки CSV',
96+
'Domain' => 'Домен',
9697
];

resources/views/gitpab/project/index_table.blade.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
'orderLinkParams' => $orderLinkParams,
1919
])
2020

21+
@include('partial.table.thcell', [
22+
'label' => __('messages.Domain'),
23+
])
24+
2125
@include('partial.table.thcell', [
2226
'column' => $columnTitleName,
2327
'label' => $columnTitleLabel,
@@ -54,9 +58,12 @@
5458
@forelse ($itemsList->items() as $key => $item)
5559
<tr>
5660
<td class="col-md-1">{{ $item->id }}</td>
61+
<td class="col-md-3">
62+
{{ parse_url($item->web_url)['host'] ?? null }}
63+
</td>
5764
<td class="col-md-3">
5865
<a href="{{ route($showRoute, [$item->id]) }}">
59-
{{ (isset($columnTitleName)) ? $item->{$columnTitleName} : $item->title }}
66+
{{ $item->path_with_namespace }}
6067
</a>
6168
</td>
6269
<td class="col-md-2">

resources/views/gitpab/time/index_filter_form.blade.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,7 @@
3131
])
3232
</div>
3333
</div>
34-
<div class="col-md-2">
35-
<div class="form-group">
36-
@include('partial.form.element.select', [
37-
'name' => 'projects[]',
38-
'list' => $projectsList,
39-
'selected' => $request->input('projects'),
40-
'options' => ['multiple' => 'multiple'],
41-
'label' => __('messages.Projects'),
42-
])
43-
</div>
44-
</div>
45-
<div class="col-md-2">
34+
<div class="col-md-4">
4635
<div class="form-group">
4736
@include('partial.form.element.date_range', [
4837
'name' => 'date_range',
@@ -54,10 +43,21 @@
5443
])
5544
</div>
5645
</div>
46+
<div class="col-md-12">
47+
<div class="form-group">
48+
@include('partial.form.element.select', [
49+
'name' => 'projects[]',
50+
'list' => $projectsList,
51+
'selected' => $request->input('projects'),
52+
'options' => ['multiple' => 'multiple'],
53+
'label' => __('messages.Projects'),
54+
])
55+
</div>
56+
</div>
5757
</div>
5858

5959
<div class="row">
60-
<div class="col-md-4">
60+
<div class="col-md-6">
6161
<div class="form-group">
6262
@include('partial.form.element.select', [
6363
'name' => 'labels[]',
@@ -68,7 +68,7 @@
6868
])
6969
</div>
7070
</div>
71-
<div class="col-md-4">
71+
<div class="col-md-6">
7272
<div class="form-group">
7373
@include('partial.form.element.select', [
7474
'name' => 'milestones[]',

0 commit comments

Comments
 (0)