display project namespaces

zubroide · Jun 1, 2024 · f9c7bb2 · f9c7bb2
1 parent 0f6897b
commit f9c7bb2
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 17 deletions.
diff --git a/app/Http/Controllers/IssueController.php b/app/Http/Controllers/IssueController.php
@@ -41,7 +41,7 @@ protected function prepareDataForIndex(FormRequest $request, array $data)
             $data,
             [
                 'assigneeList' => $contributorRepository->getItemsForSelect(),
-                'projectsList' => $projectRepository->getItemsForSelect(),
+                'projectsList' => $projectRepository->getItemsForSelect(null, null, 'id', 'path_with_namespace'),
                 'labelList' => $labelRepository->getItemsForSelect(null, null, 'name'),
                 'milestoneList' => $milestoneRepository->getItemsForSelect(null, null, 'id', 'title'),
                 'total' => [

diff --git a/app/Http/Controllers/TimeController.php b/app/Http/Controllers/TimeController.php
@@ -58,7 +58,7 @@ protected function prepareDataForIndex(FormRequest $request, array $data)
             $data,
             [
                 'authorsList' => $contributorRepository->getItemsForSelect(),
-                'projectsList' => $projectRepository->getItemsForSelect(),
+                'projectsList' => $projectRepository->getItemsForSelect(null, null, 'id', 'path_with_namespace'),
                 'labelList' => $labelRepository->getItemsForSelect(null, null, 'name'),
                 'milestoneList' => $milestoneRepository->getItemsForSelect(null, null, 'id', 'title'),
                 'total' => [

diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
@@ -93,4 +93,5 @@
     'of' => 'of',
     'Logout' => 'Logout',
     'Act t&m/labels CSV' => 'Act t&m/labels CSV',
+    'Domain' => 'Domain',
 ];
diff --git a/resources/lang/ru/messages.php b/resources/lang/ru/messages.php
@@ -93,4 +93,5 @@
     'of' => 'из',
     'Logout' => 'Выход',
     'Act t&m/labels CSV' => 'Акт t&m/метки CSV',
+    'Domain' => 'Домен',
 ];
diff --git a/resources/views/gitpab/project/index_table.blade.php b/resources/views/gitpab/project/index_table.blade.php
@@ -18,6 +18,10 @@
             'orderLinkParams' => $orderLinkParams,
         ])
 
+        @include('partial.table.thcell', [
+            'label' => __('messages.Domain'),
+        ])
+
         @include('partial.table.thcell', [
             'column' => $columnTitleName,
             'label' => $columnTitleLabel,
@@ -54,9 +58,12 @@
     @forelse ($itemsList->items() as $key => $item)
         <tr>
             <td class="col-md-1">{{ $item->id }}</td>
+            <td class="col-md-3">
+                    {{ parse_url($item->web_url)['host'] ?? null }}
+            </td>
             <td class="col-md-3">
                 <a href="{{ route($showRoute, [$item->id]) }}">
-                    {{ (isset($columnTitleName)) ? $item->{$columnTitleName} : $item->title }}
+                    {{ $item->path_with_namespace }}
                 </a>
             </td>
             <td class="col-md-2">

diff --git a/resources/views/gitpab/time/index_filter_form.blade.php b/resources/views/gitpab/time/index_filter_form.blade.php
@@ -31,18 +31,7 @@
                 ])
             </div>
         </div>
-        <div class="col-md-2">
-            <div class="form-group">
-                @include('partial.form.element.select', [
-                    'name' => 'projects[]',
-                    'list' => $projectsList,
-                    'selected' => $request->input('projects'),
-                    'options' => ['multiple' => 'multiple'],
-                    'label' => __('messages.Projects'),
-                ])
-            </div>
-        </div>
-        <div class="col-md-2">
+        <div class="col-md-4">
             <div class="form-group">
                 @include('partial.form.element.date_range', [
                     'name' => 'date_range',
@@ -54,10 +43,21 @@
                 ])
             </div>
         </div>
+        <div class="col-md-12">
+            <div class="form-group">
+                @include('partial.form.element.select', [
+                    'name' => 'projects[]',
+                    'list' => $projectsList,
+                    'selected' => $request->input('projects'),
+                    'options' => ['multiple' => 'multiple'],
+                    'label' => __('messages.Projects'),
+                ])
+            </div>
+        </div>
     </div>
 
     <div class="row">
-        <div class="col-md-4">
+        <div class="col-md-6">
             <div class="form-group">
                 @include('partial.form.element.select', [
                     'name' => 'labels[]',
@@ -68,7 +68,7 @@
                 ])
             </div>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-6">
             <div class="form-group">
                 @include('partial.form.element.select', [
                     'name' => 'milestones[]',