Skip to content

P
Platform
Unverified Commit 16b887e4 authored by Nicolas Widart's avatar Nicolas Widart
Browse files
Options

Loging in the user found via the bearer token. 

Failsafe if the user isn't set on a revision to use empty string.
Fixes #308
parent c7d0da5f
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 2 deletions
Modules/Translation/Http/Controllers/Api/TranslationController.php
View file @ 16b887e4
...@@ -2,13 +2,17 @@ ...@@ -2,13 +2,17 @@
namespace Modules\Translation\Http\Controllers\Api; namespace Modules\Translation\Http\Controllers\Api;
use Cartalyst\Sentinel\Laravel\Facades\Sentinel;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Routing\Controller; use Illuminate\Routing\Controller;
use Modules\Translation\Repositories\TranslationRepository; use Modules\Translation\Repositories\TranslationRepository;
use Modules\User\CanFindUserWithBearerToken;
class TranslationController extends Controller class TranslationController extends Controller
{ {
use CanFindUserWithBearerToken;
/** /**
* @var TranslationRepository * @var TranslationRepository
*/ */
...@@ -21,6 +25,8 @@ class TranslationController extends Controller ...@@ -21,6 +25,8 @@ class TranslationController extends Controller
public function update(Request $request) public function update(Request $request)
{ {
Sentinel::login($this->findUserWithBearerToken($request->header('Authorization')));
$this->translation->saveTranslationForLocaleAndKey( $this->translation->saveTranslationForLocaleAndKey(
$request->get('locale'), $request->get('locale'),
$request->get('key'), $request->get('key'),
...@@ -65,11 +71,13 @@ class TranslationController extends Controller ...@@ -65,11 +71,13 @@ class TranslationController extends Controller
$timeAgo = $history->created_at->diffForHumans(); $timeAgo = $history->created_at->diffForHumans();
$revertRoute = route('admin.translation.translation.update', [$history->revisionable_id, 'oldValue' => $history->oldValue()]); $revertRoute = route('admin.translation.translation.update', [$history->revisionable_id, 'oldValue' => $history->oldValue()]);
$edited = trans('translation::translations.edited'); $edited = trans('translation::translations.edited');
$firstName = $history->userResponsible() ? $history->userResponsible()->first_name : '';
$lastName = $history->userResponsible() ? $history->userResponsible()->last_name : '';
return <<<HTML return <<<HTML
<tr> <tr>
<td>{$history->oldValue()}</td> <td>{$history->oldValue()}</td>
<td>{$history->userResponsible()->first_name} {$history->userResponsible()->last_name}</td> <td>{$firstName} {$lastName}</td>
<td>$edited</td> <td>$edited</td>
<td><a data-toggle="tooltip" title="{$history->created_at}">{$timeAgo}</a></td> <td><a data-toggle="tooltip" title="{$history->created_at}">{$timeAgo}</a></td>
<td><a href="{$revertRoute}"><i class="fa fa-history"></i></a></td> <td><a href="{$revertRoute}"><i class="fa fa-history"></i></a></td>
...@@ -81,11 +89,13 @@ HTML; ...@@ -81,11 +89,13 @@ HTML;
{ {
$timeAgo = $history->created_at->diffForHumans(); $timeAgo = $history->created_at->diffForHumans();
$created = trans('translation::translations.created'); $created = trans('translation::translations.created');
$firstName = $history->userResponsible() ? $history->userResponsible()->first_name : '';
$lastName = $history->userResponsible() ? $history->userResponsible()->last_name : '';
return <<<HTML return <<<HTML
<tr> <tr>
<td></td> <td></td>
<td>{$history->userResponsible()->first_name} {$history->userResponsible()->last_name}</td> <td>{$firstName} {$lastName}</td>
<td>$created</td> <td>$created</td>
<td><a data-toggle="tooltip" title="{$history->created_at}">{$timeAgo}</a></td> <td><a data-toggle="tooltip" title="{$history->created_at}">{$timeAgo}</a></td>
<td></td> <td></td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023