- mcamara/laravel-localization update
- download files with correct file extension - data type of value of abstratct is now "text" - geopackage seeder is now application/x-sqlite3 - style improvements for search
This commit is contained in:
parent
7bf0337faf
commit
024002eded
|
@ -13,6 +13,8 @@ class FileController extends Controller
|
||||||
//$report = $this->report->find($id);
|
//$report = $this->report->find($id);
|
||||||
$file = File::findOrFail($id);
|
$file = File::findOrFail($id);
|
||||||
$file_path = public_path('storage/' . $file->path_name);
|
$file_path = public_path('storage/' . $file->path_name);
|
||||||
return response()->download($file_path, $file->label, ['Content-Type:' . $file->mime_type]);
|
$ext = \Illuminate\Support\Facades\File::extension($file_path);
|
||||||
|
return response()->download($file_path, $file->label . "." . $ext, ['Content-Type:' . $file->mime_type]);
|
||||||
|
// return response()->download($file_path, $file->label, ['Content-Type:' . $file->mime_type]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
10
composer.lock
generated
10
composer.lock
generated
|
@ -1089,16 +1089,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "mcamara/laravel-localization",
|
"name": "mcamara/laravel-localization",
|
||||||
"version": "1.4.1",
|
"version": "1.4.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/mcamara/laravel-localization.git",
|
"url": "https://github.com/mcamara/laravel-localization.git",
|
||||||
"reference": "82d06c66cdf1e3ed17783842886d87cbd5aadd43"
|
"reference": "d228a61afd8cfe9eb7f8f7450acfa0371382407d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/82d06c66cdf1e3ed17783842886d87cbd5aadd43",
|
"url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/d228a61afd8cfe9eb7f8f7450acfa0371382407d",
|
||||||
"reference": "82d06c66cdf1e3ed17783842886d87cbd5aadd43",
|
"reference": "d228a61afd8cfe9eb7f8f7450acfa0371382407d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1147,7 +1147,7 @@
|
||||||
"localization",
|
"localization",
|
||||||
"php"
|
"php"
|
||||||
],
|
],
|
||||||
"time": "2019-09-08T13:56:19+00:00"
|
"time": "2019-09-20T15:24:04+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "monolog/monolog",
|
"name": "monolog/monolog",
|
||||||
|
|
|
@ -24,7 +24,7 @@ class CreateDatasetAbstractsTable extends Migration
|
||||||
'type',
|
'type',
|
||||||
['abstract' => 'Abstract', 'methods' => 'Methods', 'series_information' => 'Series_information', 'technical_info' => 'Technical_info', 'translated' => 'Translated', 'other' => 'Other']
|
['abstract' => 'Abstract', 'methods' => 'Methods', 'series_information' => 'Series_information', 'technical_info' => 'Technical_info', 'translated' => 'Translated', 'other' => 'Other']
|
||||||
);
|
);
|
||||||
$table->string('value', 255);
|
$table->text('value');
|
||||||
$table->string('language', 3);
|
$table->string('language', 3);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ class MimetypeTableSeeder extends Seeder
|
||||||
|
|
||||||
DB::table('mime_types')->insert([
|
DB::table('mime_types')->insert([
|
||||||
[
|
[
|
||||||
'name' => 'application/geopackage+sqlite3',
|
'name' => 'application/x-sqlite3',
|
||||||
'file_extension' => 'gpkg',
|
'file_extension' => 'gpkg',
|
||||||
'enabled' =>true,
|
'enabled' =>true,
|
||||||
'created_at' => Carbon::now(),
|
'created_at' => Carbon::now(),
|
||||||
|
|
|
@ -86,6 +86,8 @@
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
|
|
||||||
|
@section('head')
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.sidebar-simplesearch {
|
.sidebar-simplesearch {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -107,3 +109,6 @@
|
||||||
color: #666;
|
color: #666;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
|
|
@ -68,8 +68,8 @@
|
||||||
href="{{ route('frontend.home.intro') }}">Intro</a>
|
href="{{ route('frontend.home.intro') }}">Intro</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a class="pure-menu-item {{ Route::currentRouteName() == 'frontend.search.index' ? 'current' : '' }}"
|
<a class="{{ Route::currentRouteName() == 'frontend.search.index' ? 'current' : '' }}"
|
||||||
href="{{ route('frontend.search.index') }}"> SEARCH</a>
|
href="{{ route('frontend.search.index') }}">Search</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<!-- <li><a href="#work">Work</a></li> -->
|
<!-- <li><a href="#work">Work</a></li> -->
|
||||||
|
|
Loading…
Reference in New Issue
Block a user