geolba/tethys
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity

error fix in the publication process

Browse source
This commit is contained in:
Arno Kaimbacher 2019-02-19 18:52:52 +01:00
parent ef0b5131ce
commit b7b04a61d6
6 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/Http/Controllers/Frontend/SearchController.php
View file

@ -54,21 +54,20 @@ class SearchController extends Controller
}
}
public function search1(Request $request): View
{
$this->_request = $request;
$data = $request->all();
//$this->searchtype = $request->input('searchtype');
$this->searchtype = $request->input('searchtype');
return view('frontend.solrsearch.index');
}
// public function search1(Request $request): View
// {
// $this->_request = $request;
// $data = $request->all();
// $this->searchtype = $request->input('searchtype');
// return view('frontend.solrsearch.index');
// }
public function search(Request $request): View
{
Log::info('Received new search request. Redirecting to search action of IndexController.');
$this->_request = $request;
//$filter =$request->input('query');
$filter =$request->input('query');
// $query = $this->client->createSelect();
// $query->setQuery('%P1%', array($filter));
// // $query->setQuery('*:*');
@ -91,9 +90,9 @@ class SearchController extends Controller
$results = $this->resultList->getResults();
$numOfHits = $this->numOfHits;
return view('frontend.solrsearch.index', compact('results', 'numOfHits'));
return view('frontend.solrsearch.index', compact('results', 'numOfHits', 'filter'));
}
return view('frontend.solrsearch.index');
return view('frontend.solrsearch.index', compact('filter'));
}
/**

4
app/Http/Controllers/Publish/IndexController.php
View file

@ -391,8 +391,8 @@ class IndexController extends Controller
if (isset($data['geolocation'])) {
$formGeolocation = $request->input('geolocation');
if ($formGeolocation['xmin'] !== '' && $formGeolocation['ymin'] !== '' &&
$formGeolocation['xmax'] !== '' && $formGeolocation['ymax'] !== '') {
if ($formGeolocation['xmin'] !== null && $formGeolocation['ymin'] !== null &&
$formGeolocation['xmax'] !== null && $formGeolocation['ymax'] !== null) {
$geolocation = new GeolocationBox($formGeolocation);
$dataset->geolocation()->save($geolocation);
}

20
app/Models/Dataset.php
View file

@ -26,16 +26,16 @@ class Dataset extends Model
const UPDATED_AT = 'server_date_modified';
const PUBLISHED_AT = 'server_date_published';
// protected $fillable = [
// 'type',
// 'language',
// 'server_state',
// 'creating_corporation',
// 'project_id',
// 'embargo_date',
// 'belongs_to_bibliography',
// ];
protected $guarded = [];
protected $fillable = [
'type',
'language',
'server_state',
'creating_corporation',
'project_id',
'embargo_date',
'belongs_to_bibliography',
];
//protected $guarded = [];
/**
* The attributes that should be mutated to dates.
*