Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
dae6cd14
Commit
dae6cd14
authored
7 years ago
by
Aria Givi
Browse files
Options
Downloads
Patches
Plain Diff
Auswahl ueber Dropdown funktioniert noch nicht richtig
parent
c7b366fc
No related branches found
Branches containing commit
No related tags found
2 merge requests
!1040
Development
,
!1016
Resolve "Methode zum Ändern von Übersetzten Seiten entwickeln"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/Http/Controllers/LanguageController.php
+38
-32
38 additions, 32 deletions
app/Http/Controllers/LanguageController.php
resources/views/languages/synoptic.blade.php
+1
-1
1 addition, 1 deletion
resources/views/languages/synoptic.blade.php
routes/web.php
+1
-1
1 addition, 1 deletion
routes/web.php
with
40 additions
and
34 deletions
app/Http/Controllers/LanguageController.php
+
38
−
32
View file @
dae6cd14
...
...
@@ -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'
]]));
}
}
}
...
...
This diff is collapsed.
Click to expand it.
resources/views/languages/synoptic.blade.php
+
1
−
1
View file @
dae6cd14
...
...
@@ -18,7 +18,7 @@
<input
type=
"hidden"
name=
"filename"
value=
"{{$filename}}"
/>
</form>
<p
style=
"display: inline;"
>
Andere Datei auswählen:
</p>
<select
name=
"cho
o
seFile"
form=
"submit"
type=
"submit"
>
<select
name=
"chose
n
File"
form=
"submit"
onchange=
"this.form.submit()"
type=
"submit"
>
@foreach($otherFiles as $otherFile)
<option
value=
{{$otherFile}}
>
{{ $otherFile }}
</option>
@endforeach
...
...
This diff is collapsed.
Click to expand it.
routes/web.php
+
1
−
1
View file @
dae6cd14
...
...
@@ -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'
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment