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

1. Timer auf 60 Minuten und 10 Minuten vorher eine Warnung

Browse source 
11. Continue statt Review Dataset (im Step 3)
12. keywords auf default 'uncontrolled' einfrieren
14. Lizenzen mit Links versehen
19. Timezone: 'timezone' => 'Europe/Vienna'
20. angefangen mit RDR -> TETHYS Unbenennungen
21. translated validation ausgebessert
22. dataset als Typescript Instanz
This commit is contained in:
Arno Kaimbacher 2019-11-21 18:43:56 +01:00
parent 300c8a13a9
commit 4b8f2a63d8
45 changed files with 1729 additions and 826 deletions
Download patch file Download diff file Expand all files Collapse all files

89
app/Exceptions/Handler.php
View file

@ -3,40 +3,65 @@
use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
class Handler extends ExceptionHandler {
class Handler extends ExceptionHandler
{
/**
* A list of the exception types that should not be reported.
*
* @var array
*/
protected $dontReport = [
'Symfony\Component\HttpKernel\Exception\HttpException'
];
/**
* A list of the exception types that should not be reported.
*
* @var array
*/
protected $dontReport = [
'Symfony\Component\HttpKernel\Exception\HttpException'
];
/**
* Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @return void
*/
public function report(Exception $e)
{
return parent::report($e);
}
/**
* Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @return void
*/
public function report(Exception $e)
{
return parent::report($e);
}
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $e)
{
return parent::render($request, $e);
}
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $ex)
{
if ($ex instanceof \Illuminate\Auth\Access\AuthorizationException) {
// return $this->errorResponse($exception->getMessage(), 403);
return redirect('/login', 302)
->with('error', 'The form has expired due to inactivity. Please try again');
// redirect()->guest($ex->redirectTo() ?? route('login'));
}
// if ($ex instanceof AuthorizationException) {
// // return $this->errorResponse($exception->getMessage(), 403);
// return redirect('/login', 302)
// // ->back()
// // ->withInput($request->except(['password', 'password_confirmation']))
// ->with('error', 'The form has expired due to inactivity. Please try again');
// }
// if ($ex instanceof \Illuminate\Session\TokenMismatchException) {
// // return redirect('/login', 302)
// // // ->back()
// // // ->withInput($request->except(['password', 'password_confirmation']))
// // ->with('error', 'The form has expired due to inactivity. Please try again');
// return response()->json(array(
// 'success' => true,
// //'redirect' => route('settings.document.edit', ['id' => $dataset->server_state]),
// 'redirect' => route('login')
// ));
// }
return parent::render($request, $ex);
}
}

10
app/Http/Controllers/Oai/RequestController.php
View file

@ -145,8 +145,8 @@ class RequestController extends Controller
private function handleIdentify()
{
$email = "repository@geologie.ac.at";
$repositoryName = "RDR - Data Research Repository";
$repIdentifier = "rdr.gba.ac.at";
$repositoryName = "TETHYS - Data Research Repository";
$repIdentifier = "tethys.geologie.ac.at";
$sampleIdentifier = "oai:" . $repIdentifier . ":27";//$this->_configuration->getSampleIdentifier();
$earliestDateFromDb = optional(Dataset::earliestPublicationDate())->server_date_published;
@ -281,7 +281,7 @@ class RequestController extends Controller
*/
private function handleListSets()
{
$repIdentifier = "rdr.gba.ac.at";
$repIdentifier = "tethys.geologie.ac.at";
$this->_proc->setParameter('', 'repIdentifier', $repIdentifier);
$this->_xml->appendChild($this->_xml->createElement('Datasets'));
@ -332,7 +332,7 @@ class RequestController extends Controller
$maxRecords = 100;
}
$repIdentifier = "rdr.gba.ac.at";
$repIdentifier = "tethys.geologie.ac.at";
$tokenTempPath = storage_path('app/resumption'); //$this->_configuration->getResumptionTokenPath();
$this->_proc->setParameter('', 'repIdentifier', $repIdentifier);
@ -512,7 +512,7 @@ class RequestController extends Controller
$identify = $sxe->addChild('Identify');
$identify->addChild('repositoryName', "Data Research Repository");
$identify->addChild('baseURL', "http://rdr.gba.geolba.ac.at/");
$identify->addChild('baseURL', "http://tethys.geologie.ac.at/");
$identify->addChild('protocolVersion', '2.0');
$identify->addChild('adminEmail', 'repository@geologie.ac.at');
//$identify->addChild('earliestDatestamp', '2017-04-07');

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

@ -47,7 +47,7 @@ class IndexController extends Controller
public function createStep1(Request $request)
{
#$dataset = $request->session()->get('dataset');
$licenses = License::select('id', 'name_long')
$licenses = License::select('id', 'name_long', 'link_licence')
->orderBy('sort_order')
->get();
$languages = DB::table('languages')

4
app/Http/Middleware/PermissionMiddleware.php
View file

@ -39,7 +39,7 @@ class PermissionMiddleware
//{
// abort(401);
//}
return abort(401);
//return $next($request);
// return abort(403);
throw new \Illuminate\Auth\Access\AuthorizationException('This action is unauthorized.');
}
}

2
app/Library/Search/SolrDocumentXslt.php
View file

@ -48,7 +48,7 @@ class SolrDocumentXslt
}
/**
* Retrieves XML describing model data of provided RDR dataset.
* Retrieves XML describing model data of provided TETHYS dataset.
*
* @param Dataset $rdrDataset
* @return DOMDocument