Skip to content

Commit 1d57c12

Browse files
authored
Merge pull request #2107 from LuckyCyborg/4.0
Overall improvements
2 parents 6f278e0 + 880b606 commit 1d57c12

30 files changed

Lines changed: 73 additions & 82 deletions

app/Platform/Bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// Define The Application Version
1515
//--------------------------------------------------------------------------
1616

17-
define('VERSION', '4.0.85');
17+
define('VERSION', '4.0.86');
1818

1919
//--------------------------------------------------------------------------
2020
// Set PHP Error Reporting Options

modules/Roles/Controllers/Admin/Roles.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,18 @@ public function data(Request $request)
7676
$dataTable = DataTable::make($query)
7777
->column('id')
7878
->column('name')
79-
->column('slug');
79+
->column('slug')
80+
->column('description');
8081

81-
$dataTable->column('description', function ($role)
82+
$dataTable->column('users', 'users_count');
83+
84+
$dataTable->column('created_at', function ($role)
8285
{
83-
$shortDesc = Str::limit($role->description, 80);
86+
$format = __d('roles', '%d %b %Y, %H:%M');
8487

85-
return sprintf('<div title="%s">%s</div>', e($role->description), e($shortDesc));
88+
return $role->created_at->formatLocalized($format);
8689
});
8790

88-
$dataTable->column('users', 'users_count');
89-
9091
$dataTable->column('actions', function ($role)
9192
{
9293
return View::fetch('Modules/Roles::Partials/RolesTableActions', compact('role'));

modules/Roles/Language/CS/messages.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
return array (
4+
'%d %b %Y, %H:%M' => '',
45
'%d %b %Y, %R' => '',
56
'<< Previous Page' => '',
7+
'Actions' => '',
68
'Are you sure you want to remove this Role, the operation being irreversible?' => '',
79
'Cancel' => '',
810
'Close' => '',
@@ -21,8 +23,6 @@
2123
'Field' => '',
2224
'ID' => '',
2325
'Name' => '',
24-
'No registered Roles' => '',
25-
'Operations' => '',
2626
'Platform' => '',
2727
'Please click the button <b>Delete</b> to proceed, or <b>Cancel</b> to abandon the operation.' => '',
2828
'Registered Roles' => '',
@@ -37,7 +37,6 @@
3737
'The Role <b>{0}</b> was successfully created.' => '',
3838
'The Role <b>{0}</b> was successfully deleted.' => '',
3939
'The Role <b>{0}</b> was successfully updated.' => '',
40-
'There are no registered Roles.' => '',
4140
'Updated At' => '',
4241
'User Role : <b>{0}</b>' => '',
4342
'User Roles' => '',

modules/Roles/Language/DA/messages.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
return array (
4+
'%d %b %Y, %H:%M' => '',
45
'%d %b %Y, %R' => '',
56
'<< Previous Page' => '',
7+
'Actions' => '',
68
'Are you sure you want to remove this Role, the operation being irreversible?' => '',
79
'Cancel' => '',
810
'Close' => '',
@@ -21,8 +23,6 @@
2123
'Field' => '',
2224
'ID' => '',
2325
'Name' => '',
24-
'No registered Roles' => '',
25-
'Operations' => '',
2626
'Platform' => '',
2727
'Please click the button <b>Delete</b> to proceed, or <b>Cancel</b> to abandon the operation.' => '',
2828
'Registered Roles' => '',
@@ -37,7 +37,6 @@
3737
'The Role <b>{0}</b> was successfully created.' => '',
3838
'The Role <b>{0}</b> was successfully deleted.' => '',
3939
'The Role <b>{0}</b> was successfully updated.' => '',
40-
'There are no registered Roles.' => '',
4140
'Updated At' => '',
4241
'User Role : <b>{0}</b>' => '',
4342
'User Roles' => '',

modules/Roles/Language/DE/messages.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
return array (
4+
'%d %b %Y, %H:%M' => '',
45
'%d %b %Y, %R' => '',
56
'<< Previous Page' => '',
7+
'Actions' => '',
68
'Are you sure you want to remove this Role, the operation being irreversible?' => '',
79
'Cancel' => '',
810
'Close' => '',
@@ -21,8 +23,6 @@
2123
'Field' => '',
2224
'ID' => '',
2325
'Name' => '',
24-
'No registered Roles' => '',
25-
'Operations' => '',
2626
'Platform' => '',
2727
'Please click the button <b>Delete</b> to proceed, or <b>Cancel</b> to abandon the operation.' => '',
2828
'Registered Roles' => '',
@@ -37,7 +37,6 @@
3737
'The Role <b>{0}</b> was successfully created.' => '',
3838
'The Role <b>{0}</b> was successfully deleted.' => '',
3939
'The Role <b>{0}</b> was successfully updated.' => '',
40-
'There are no registered Roles.' => '',
4140
'Updated At' => '',
4241
'User Role : <b>{0}</b>' => '',
4342
'User Roles' => '',

modules/Roles/Language/EN/messages.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
return array (
4+
'%d %b %Y, %H:%M' => '',
45
'%d %b %Y, %R' => '',
56
'<< Previous Page' => '',
7+
'Actions' => '',
68
'Are you sure you want to remove this Role, the operation being irreversible?' => '',
79
'Cancel' => '',
810
'Close' => '',
@@ -21,8 +23,6 @@
2123
'Field' => '',
2224
'ID' => '',
2325
'Name' => '',
24-
'No registered Roles' => '',
25-
'Operations' => '',
2626
'Platform' => '',
2727
'Please click the button <b>Delete</b> to proceed, or <b>Cancel</b> to abandon the operation.' => '',
2828
'Registered Roles' => '',
@@ -37,7 +37,6 @@
3737
'The Role <b>{0}</b> was successfully created.' => '',
3838
'The Role <b>{0}</b> was successfully deleted.' => '',
3939
'The Role <b>{0}</b> was successfully updated.' => '',
40-
'There are no registered Roles.' => '',
4140
'Updated At' => '',
4241
'User Role : <b>{0}</b>' => '',
4342
'User Roles' => '',

modules/Roles/Language/ES/messages.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
return array (
4+
'%d %b %Y, %H:%M' => '',
45
'%d %b %Y, %R' => '',
56
'<< Previous Page' => '',
7+
'Actions' => '',
68
'Are you sure you want to remove this Role, the operation being irreversible?' => '',
79
'Cancel' => '',
810
'Close' => '',
@@ -21,8 +23,6 @@
2123
'Field' => '',
2224
'ID' => '',
2325
'Name' => '',
24-
'No registered Roles' => '',
25-
'Operations' => '',
2626
'Platform' => '',
2727
'Please click the button <b>Delete</b> to proceed, or <b>Cancel</b> to abandon the operation.' => '',
2828
'Registered Roles' => '',
@@ -37,7 +37,6 @@
3737
'The Role <b>{0}</b> was successfully created.' => '',
3838
'The Role <b>{0}</b> was successfully deleted.' => '',
3939
'The Role <b>{0}</b> was successfully updated.' => '',
40-
'There are no registered Roles.' => '',
4140
'Updated At' => '',
4241
'User Role : <b>{0}</b>' => '',
4342
'User Roles' => '',

modules/Roles/Language/FA/messages.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
return array (
4+
'%d %b %Y, %H:%M' => '',
45
'%d %b %Y, %R' => '',
56
'<< Previous Page' => '',
7+
'Actions' => '',
68
'Are you sure you want to remove this Role, the operation being irreversible?' => '',
79
'Cancel' => '',
810
'Close' => '',
@@ -21,8 +23,6 @@
2123
'Field' => '',
2224
'ID' => '',
2325
'Name' => '',
24-
'No registered Roles' => '',
25-
'Operations' => '',
2626
'Platform' => '',
2727
'Please click the button <b>Delete</b> to proceed, or <b>Cancel</b> to abandon the operation.' => '',
2828
'Registered Roles' => '',
@@ -37,7 +37,6 @@
3737
'The Role <b>{0}</b> was successfully created.' => '',
3838
'The Role <b>{0}</b> was successfully deleted.' => '',
3939
'The Role <b>{0}</b> was successfully updated.' => '',
40-
'There are no registered Roles.' => '',
4140
'Updated At' => '',
4241
'User Role : <b>{0}</b>' => '',
4342
'User Roles' => '',

modules/Roles/Language/FR/messages.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
return array (
4+
'%d %b %Y, %H:%M' => '',
45
'%d %b %Y, %R' => '',
56
'<< Previous Page' => '',
7+
'Actions' => '',
68
'Are you sure you want to remove this Role, the operation being irreversible?' => '',
79
'Cancel' => '',
810
'Close' => '',
@@ -21,8 +23,6 @@
2123
'Field' => '',
2224
'ID' => '',
2325
'Name' => '',
24-
'No registered Roles' => '',
25-
'Operations' => '',
2626
'Platform' => '',
2727
'Please click the button <b>Delete</b> to proceed, or <b>Cancel</b> to abandon the operation.' => '',
2828
'Registered Roles' => '',
@@ -37,7 +37,6 @@
3737
'The Role <b>{0}</b> was successfully created.' => '',
3838
'The Role <b>{0}</b> was successfully deleted.' => '',
3939
'The Role <b>{0}</b> was successfully updated.' => '',
40-
'There are no registered Roles.' => '',
4140
'Updated At' => '',
4241
'User Role : <b>{0}</b>' => '',
4342
'User Roles' => '',

modules/Roles/Language/IT/messages.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
return array (
4+
'%d %b %Y, %H:%M' => '',
45
'%d %b %Y, %R' => '',
56
'<< Previous Page' => '',
7+
'Actions' => '',
68
'Are you sure you want to remove this Role, the operation being irreversible?' => '',
79
'Cancel' => '',
810
'Close' => '',
@@ -21,8 +23,6 @@
2123
'Field' => '',
2224
'ID' => '',
2325
'Name' => '',
24-
'No registered Roles' => '',
25-
'Operations' => '',
2626
'Platform' => '',
2727
'Please click the button <b>Delete</b> to proceed, or <b>Cancel</b> to abandon the operation.' => '',
2828
'Registered Roles' => '',
@@ -37,7 +37,6 @@
3737
'The Role <b>{0}</b> was successfully created.' => '',
3838
'The Role <b>{0}</b> was successfully deleted.' => '',
3939
'The Role <b>{0}</b> was successfully updated.' => '',
40-
'There are no registered Roles.' => '',
4140
'Updated At' => '',
4241
'User Role : <b>{0}</b>' => '',
4342
'User Roles' => '',

0 commit comments

Comments
 (0)