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

backend improvements

Browse source
This commit is contained in:
Arno Kaimbacher 2018-10-10 18:28:51 +02:00
parent 50bcae442e
commit 4ac1c34b6a
16 changed files with 199 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -244,7 +244,7 @@ class IndexController extends Controller
$dataset->save();
//store related files
if (null != $data['files']) {
if (isset($data['files'])) {
foreach ($data['files'] as $uploadedFile) {
$file = $uploadedFile['file'];
$label = urldecode($uploadedFile['label']);
@ -299,7 +299,9 @@ class IndexController extends Controller
DB::commit();
} catch (\Exception $e) {
DB::rollback();
Storage::deleteDirectory($datasetFolder);
if (isset($datasetFolder)) {
Storage::deleteDirectory($datasetFolder);
}
return response()->json([
'success' => false,
'error' => [
@ -310,7 +312,9 @@ class IndexController extends Controller
//throw $e;
} catch (\Throwable $e) {
DB::rollback();
Storage::deleteDirectory($datasetFolder);
if (isset($datasetFolder)) {
Storage::deleteDirectory($datasetFolder);
}
return response()->json([
'success' => false,
'error' => [

3
app/Http/Controllers/Settings/LicenseController.php
View file

@ -21,7 +21,8 @@ class LicenseController extends Controller
public function index() : View
{
$licenses = License::get();
$direction = 'asc'; // or desc
$licenses = License::orderBy('sort_order', $direction)->get();
return view('settings.license.license', compact('licenses'));
}

2
app/Http/Controllers/Settings/PersonController.php
View file

@ -117,7 +117,7 @@ class PersonController extends Controller
}
/**
* activatew author, submitter etc....
* activate author, submitter etc....
*
* @param int $id
* @return \Illuminate\Http\Response

2
app/Models/Collection.php
View file

@ -8,8 +8,10 @@ use App\Models\Dataset;
class Collection extends Model
{
public $timestamps = false;
//mass assignable
protected $fillable = [
'name',
'number',
'role_id',
];

5
app/Models/License.php
View file

@ -27,4 +27,9 @@ class License extends Model
{
return $this->belongsToMany(Dataset::class, 'link_documents_licences', 'licence_id', 'document_id');
}
public function getCheckedAttribute()
{
return "false";
}
}