Skip to content

Feature/multiple files02 #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: development-php-8.3.9
Choose a base branch
from
Open

Feature/multiple files02 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b77b9f
updates
dhananj001 Dec 4, 2024
89b0fad
changes made but still not working
dhananj001 Dec 4, 2024
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
1,005 changes: 534 additions & 471 deletions app/Http/Controllers/DocumentController.php
View file
Open in desktop

Large diffs are not rendered by default.

996 changes: 550 additions & 446 deletions resources/views/document-details.blade.php
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions resources/views/upload.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
$(document).ready(function() {
$('.selectsequence').select2();

@if(empty($document->id))
// validation for either document or external link
$(document).on('submit','form#upload-form', function(){
Expand Down Expand Up @@ -38,7 +38,7 @@
file_picker_callback : function(callback, value, meta) {
var x = window.innerWidth || document.documentElement.clientWidth || document.getElementsByTagName('body')[0].clientWidth;
var y = window.innerHeight|| document.documentElement.clientHeight|| document.getElementsByTagName('body')[0].clientHeight;

var cmsURL = '/laravel-filemanager?editor=' + meta.fieldname;
if (meta.filetype == 'image') {
cmsURL = cmsURL + "&type=Images";
Expand All @@ -58,7 +58,7 @@
}
});
}

});


Expand Down Expand Up @@ -101,7 +101,7 @@
<label for="title" class="col-md-12 col-form-label text-md-right">Title</label>
</div>
<div class="col-md-9">
<input class="form-control" type="text" id="title" name="title" size="40" value="{{ old('title',$document->title) }}"
<input class="form-control" type="text" id="title" name="title" size="40" value="{{ old('title',$document->title) }}"
placeholder="If left blank, we shall guess!" maxlength="150" />
</div>
</div>
Expand All @@ -112,7 +112,7 @@
</div>
<div class="col-md-9">
<label for='filesize'><font color="red">File size must be less than {{ $size_limit }}B.</font></label>
<input id="uploadfile" type="file" class="form-control-file" name="document"/>
<input id="uploadfile" type="file" class="form-control-file" name="document[]" multiple/>
</div>
</div>
@endif
Expand All @@ -123,11 +123,11 @@
</div>
<div class="col-md-9">
@if(empty($document->id))
Enter a link below only if there's no document to be uploaded.
Enter a link below only if there's no document to be uploaded.
@endif
<input type="text" class="form-control-file" id="externallink" name="external_link"
value="{{ old('external_link', $document->external_link) }}"
placeholder="https://..." maxlength="150" >
<input type="text" class="form-control-file" id="externallink" name="external_link"
value="{{ old('external_link', $document->external_link) }}"
placeholder="https://..." maxlength="150" >
</div>
</div>
@endif
Expand Down Expand Up @@ -155,15 +155,15 @@
foreach($user_roles as $u_r){
$user_rol[] = $u_r->role_id;
}
@endphp
@endphp
@foreach($collection->meta_fields as $f)
@php
@php
//$permission_intersection = [];
$role_intersection = [];
if(!empty($f->available_to)){
if(!empty($f->available_to)){
$available_to = explode(",",$f->available_to);
$role_intersection = array_intersect($user_rol,$available_to);
}
}
@endphp
@if(!empty($role_intersection) || (!empty($f->available_to) && $f->available_to == '100'))
<div class="form-group row">
Expand All @@ -185,7 +185,7 @@
<input id="meta_field_{{$f->id}}" max="2999-12-31" type="date" name="meta_field_{{$f->id}}" value="{{ old('meta_field_'.$f->id, $document->meta_value($f->id)) }}" placeholder="{{ $f->placeholder }}" @if($f->is_required == 1) {{ ' required' }} @endif />

@elseif (in_array($f->type, array('Select', 'MultiSelect')))
<select class="form-control selectsequence" id="meta_field_{{$f->id}}" name="meta_field_{{$f->id}}[]" @if($f->type == 'MultiSelect') multiple @endif
<select class="form-control selectsequence" id="meta_field_{{$f->id}}" name="meta_field_{{$f->id}}[]" @if($f->type == 'MultiSelect') multiple @endif
@if($f->is_required == 1) {{ ' required' }} @endif >
@php
$options = explode(",", $f->options);
Expand Down Expand Up @@ -235,9 +235,9 @@ function getTree($children, $document, $f, $parent_id = null, $parents = null){
if (@in_array($t->id, $old_vals)){
$selected='selected="selected"';
}
if(!empty($children['parent_'.$t->id]) && count($children['parent_'.$t->id]) > 0){
if(!empty($children['parent_'.$t->id]) && count($children['parent_'.$t->id]) > 0){
// we need not show the parents for selection
// they should be automatically pupulated/set in the controller
// they should be automatically pupulated/set in the controller
//echo '<option value="'.$t->id.'" '.$selected.'>'.$parents.$t->label.'</option>';
$parents_tmp = $parents. $t->label .' - ';
getTree($children, $document, $f, $t->id, $parents_tmp);
Expand All @@ -249,7 +249,7 @@ function getTree($children, $document, $f, $parent_id = null, $parents = null){
}
}
@endphp
<select class="form-control selectsequence" id="meta_field_{{$f->id}}" name="meta_field_{{$f->id}}[]" multiple
<select class="form-control selectsequence" id="meta_field_{{$f->id}}" name="meta_field_{{$f->id}}[]" multiple
@if($f->is_required == 1) {{ ' required' }} @endif >
@php
getTree($children, $document, $f, $f->options);
Expand All @@ -266,7 +266,7 @@ function getTree($children, $document, $f, $parent_id = null, $parents = null){
@endforeach
<div class="form-group row">
<div class="col-md-3 text-right">
<input id="same_meta_docs" type="checkbox" name="same_meta_docs_upload" value="1" />
<input id="same_meta_docs" type="checkbox" name="same_meta_docs_upload" value="1" />
</div>
<div class="col-md-9">
<label for="same_meta_docs" class="col-md-12 col-form-label">Upload more documents of the same field values above</label>
Expand Down
6 changes: 5 additions & 1 deletion routes/web.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
Route::post('/admin/taxonomies/delete','TaxonomyController@destroy')->middleware('admin');
Route::get('autocomplete', 'TaxonomyController@autoComplete')->name('autocomplete');
Route::get('/taxonomies/{id}/add','TaxonomyController@add')->middleware('admin');
Route::post('/taxonomies/{id}/addstore','TaxonomyController@addstore')->middleware('admin')->name('taxonomies.addstore');
Route::post('/taxonomies/{id}/addstore','TaxonomyController@addstore')->middleware('admin')->name('taxonomies.addstore');

// Templates Management
Route::get('/admin/srtemplatemanagement', 'SRTemplateController@index')->middleware('admin');
Expand Down Expand Up @@ -272,4 +272,8 @@
Route::group(['prefix' => 'laravel-filemanager', 'middleware' => ['web', 'auth']], function (){
\UniSharp\LaravelFilemanager\Lfm::routes();
}

);

Route::get('/collection/{collectionId}/document/{documentId}/file/{filename}', [DocumentController::class, 'getFile'])->name('documents.getFile');

Binary file added storage/app/smartarchive_assets/1/1/1_1733286647_Fundamentals of Laravel - Part 1.pdf
View file
Open in desktop
Binary file not shown.
Binary file added storage/app/smartarchive_assets/1/1/1_1733286678_Fundamentals of Laravel - Part 1.pdf
View file
Open in desktop
Binary file not shown.
Binary file added storage/app/smartarchive_assets/1/1/1_1733286759_Fundamentals of Laravel4.pdf
View file
Open in desktop
Binary file not shown.
Binary file added storage/app/smartarchive_assets/1/1/1_1733286759_Fundamentals of Laravel5.pdf
View file
Open in desktop
Binary file not shown.
Binary file added storage/app/smartarchive_assets/1/1/1_1733287288_Fundamentals of Laravel2.pdf
View file
Open in desktop
Binary file not shown.
Binary file added storage/app/smartarchive_assets/1/1/1_1733287822_Fundamentals of Laravel - Part 1.pdf
View file
Open in desktop
Binary file not shown.
Binary file added storage/app/smartarchive_assets/1/1/1_1733288019_Fundamentals of Laravel - Part 1.pdf
View file
Open in desktop
Binary file not shown.
Binary file added storage/app/smartarchive_assets/1/1/1_1733288019_Fundamentals of Laravel2.pdf
View file
Open in desktop
Binary file not shown.
Binary file added storage/app/smartarchive_assets/1/1/1_1733288019_Fundamentals of Laravel3.pdf
View file
Open in desktop
Binary file not shown.