fix lang bug

This commit is contained in:
decoder 2024-04-25 23:29:44 +05:00
parent d8a271adb4
commit 2d0d36af7e
2 changed files with 15 additions and 5 deletions

View File

@ -278,7 +278,7 @@ class HomeController extends Controller
$forms = UserForm::join('forms', 'user_forms.form_id', '=', 'forms.id')
->leftJoin('users', 'forms.created_by', '=', 'users.id')
->where('user_forms.assigned_to', \Auth::id())
->select('user_forms.permissions as permissions', 'forms.name as name', 'forms.description as description', 'forms.id as form_id', 'forms.created_at as created_at', 'forms.slug as slug', 'users.name as created_by');
->select('user_forms.permissions as permissions', 'forms.name as name', 'forms.name_ru as name_ru', 'forms.name_est as name_est', 'forms.description as description', 'forms.description_ru as description_ru', 'forms.description_est as description_est', 'forms.id as form_id', 'forms.created_at as created_at', 'forms.slug as slug', 'users.name as created_by');
return DataTables::of($forms)
->addColumn(

View File

@ -407,12 +407,22 @@
}
],
columns: [{
data: 'name',
name: 'forms.name'
data: descColName,
name: 'forms.' + descColName,
createdCell: function(td, cellData, rowData, row, col) {
if (td.innerHTML.length === 0) {
td.innerHTML = rowData.description
}
},
},
{
data: 'description',
name: 'forms.description'
data: titleColName,
name: 'forms.' + titleColName,
createdCell: function(td, cellData, rowData, row, col) {
if (td.innerHTML.length === 0) {
td.innerHTML = rowData.name
}
},
},
@if (auth()->user()->hasRole(\App\Enums\User\RoleEnum::SUPERVISOR->value))
{