Skip to content
Snippets Groups Projects
Commit dae6cd14 authored by Aria Givi's avatar Aria Givi
Browse files

Auswahl ueber Dropdown funktioniert noch nicht richtig

parent c7b366fc
No related branches found
No related tags found
2 merge requests!1040Development,!1016Resolve "Methode zum Ändern von Übersetzten Seiten entwickeln"
......@@ -143,7 +143,7 @@ class LanguageController extends Controller
->with('email', $email); //Email-Adresse des Benutzers
}
public function createSynopticEditPage(Request $request, $exclude = "")
public function createSynopticEditPage(Request $request, $exclude = "", $chosenFile = "")
{
$languageFolders = scandir($this->languageFilePath);
......@@ -188,13 +188,16 @@ class LanguageController extends Controller
$fn = "";
# Wähle die erste, unbearbeitete Datei aus
foreach($languageObjects as $folder => $languageObject) {
foreach($languageObject->stringMap as $languageFileName => $languageFile) {
$fn = $languageFileName;
break 2;
if($chosenFile !== "") {
$fn = $chosenFile;
} else {
foreach($languageObjects as $folder => $languageObject) {
foreach($languageObject->stringMap as $languageFileName => $languageFile) {
$fn = $languageFileName;
break 2;
}
}
}
$snippets = [];
$changeTime = 0;
$recentlyChangedFiles = [];
......@@ -255,32 +258,8 @@ class LanguageController extends Controller
$filename = $request->input('filename');
# Identifizieren des gedrückten Buttons
if(isset($request['nextpage'])) {
# Leite weiter zur nächsten Seite
$ex = [];
if ($exclude !== "") {
try {
$ex = unserialize(base64_decode($exclude));
} catch (\ErrorException $e) {
$ex = [];
}
if (!isset($ex["files"])) {
$ex["files"] = [];
}
}
if (!isset($ex["new"])) {
$ex["new"] = 0;
}
$ex['files'][] = basename($filename);
$ex = base64_encode(serialize($ex));
return redirect(url('synoptic', ['exclude' => $ex]));
} elseif(isset($request['download'])) {
# Andernfalls auslesen, zippen und herunterladen der veränderten Dateien
if(isset($request['download'])) {
# Auslesen, zippen und herunterladen der veränderten Dateien
$data = [];
$new = 0;
......@@ -365,6 +344,33 @@ class LanguageController extends Controller
} catch(ErrorException $e) {
echo("Failed to write ".$filename);
}
# Andernfalls weiterleiten zur nächsten Seite
} else {
$ex = [];
if ($exclude !== "") {
try {
$ex = unserialize(base64_decode($exclude));
} catch (\ErrorException $e) {
$ex = [];
}
if (!isset($ex["files"])) {
$ex["files"] = [];
}
}
if (!isset($ex["new"])) {
$ex["new"] = 0;
}
$ex['files'][] = basename($filename);
$ex = base64_encode(serialize($ex));
if(isset($request['nextpage'])) {
return redirect(url('synoptic', ['exclude' => $ex]));
} elseif(isset($request['chosenFile'])) {
return redirect(url('synoptic', ['exclude' => $ex], ['chosenFile' => $request['chosenFile']]));
}
}
}
......
......@@ -18,7 +18,7 @@
<input type="hidden" name="filename" value="{{$filename}}" />
</form>
<p style="display: inline;"> Andere Datei auswählen: </p>
<select name="chooseFile" form="submit" type="submit">
<select name="chosenFile" form="submit" onchange="this.form.submit()" type="submit">
@foreach($otherFiles as $otherFile)
<option value={{$otherFile}}>{{ $otherFile }}</option>
@endforeach
......
......@@ -164,7 +164,7 @@ Route::group(
return redirect('https://metager.de/klassik/databund');
});
Route::get('languages', 'LanguageController@createOverview');
Route::get('synoptic/{exclude?}', 'LanguageController@createSynopticEditPage');
Route::get('synoptic/{exclude?}/{chosenFile?}', 'LanguageController@createSynopticEditPage');
Route::post('synoptic/{exclude?}', 'LanguageController@processSynopticPageInput');
Route::get('languages/edit/{from}/{to}/{exclude?}/{email?}', 'LanguageController@createEditPage');
Route::post('languages/edit/{from}/{to}/{exclude?}/{email?}', 'MailController@sendLanguageFile');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment