Merge branch 'development' of https://github.com/CarvingIT/smart-archive

into development
CarvingIT · Apr 3, 2024 · 534cc1e · 534cc1e
2 parents 77a2bed + bbdcc78
commit 534cc1e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php
@@ -33,7 +33,7 @@ public function __construct()
     }
 
     public function index(){
-        $collections = Collection::where('parent_id', null)->get();
+        $collections = Collection::all();
         return view('collectionmanagement', ['collections'=>$collections, 'activePage'=>'Collections','titlePage'=>'Collections']);
     }
 

diff --git a/resources/views/collectionmanagement.blade.php b/resources/views/collectionmanagement.blade.php
@@ -71,6 +71,7 @@ function randomString(length) {
                             <tr>
                             <th>Name</th>
                             <th>Type</th>
+                            <th>Parent collection</th>
                             <th>Created</th>
                             <th class="text-right">Actions</th>
                             </tr>
@@ -80,6 +81,7 @@ function randomString(length) {
                         <tr>
                             <td>{{ $c->name }}</td>
                             <td>{{ $c->type }}</td>
+                            <td>{{ @$c->parent->name }}</td>
                             <td>{{ $c->created_at }}</td>
                             <td class="td-actions text-right">
                                 <a rel="tooltip" class="btn btn-success btn-link" href="/admin/collection-form/{{$c->id}}">

diff --git a/resources/views/document-details.blade.php b/resources/views/document-details.blade.php
@@ -238,7 +238,11 @@ function showDeleteDialog(){
 				<br />
 
 			@if($c->content_type == 'Uploaded documents')
+			@if ($document->related_documents->count() > 0)
 			<div class="col-md-9 row">
+			@else
+			<div class="col-md-12 row">
+			@endif
 				@foreach($document->collection->meta_fields as $meta_field)
 
 			@php 
@@ -317,6 +321,7 @@ function showDeleteDialog(){
 			@endif {{-- display document status and comment section only for logged in user --}}
 
 				</div>
+				@if ($document->related_documents->count() > 0)
 				<div class="col-md-3">
 				<h5>Related Documents</h5>
 				<ul>
@@ -325,6 +330,7 @@ function showDeleteDialog(){
 				@endforeach
 				</ul>
 				</div>
+				@endif
 			</div><!-- row ends -->
 			@endif