diff --git a/app/config/version.php b/app/config/version.php
index 59dcea319d..66f99e9409 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
'v1.2.7-beta',
- 'hash_version' => 'v1.2.7-beta-10-g48ccf84',
+ 'app_version' => 'v1.2.7-1',
+ 'hash_version' => 'v1.2.7-1-gbbdbd53',
);
\ No newline at end of file
diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 9a8c379398..d3ed968d1d 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -686,7 +686,7 @@ class UsersController extends AdminController
public function getDatatable($status = null)
{
- $users = User::with('assets','licenses','manager','sentryThrottle');
+ $users = User::with('assets','accessories','licenses','manager','sentryThrottle','groups');
switch ($status) {
case 'deleted':
@@ -751,13 +751,28 @@ class UsersController extends AdminController
{
return $users->licenses->count();
})
+
+ ->addColumn('accessories',function($users)
+ {
+ return $users->accessories->count();
+ })
+
+ ->addColumn('groups',function($users)
+ {
+ $group_names = '';
+ foreach ($users->groups as $group) {
+ $group_names .= ''.$group->name.' ';
+ }
+ return $group_names;
+ })
+
->addColumn('activated',function($users)
{
return $users->isActivated() ? '' : '';
})
->addColumn($actions)
- ->searchColumns('name','email','manager','activated', 'licenses','assets')
+ ->searchColumns('name','email','manager','activated', 'accessories','groups')
->orderColumns('name','email','manager','activated', 'licenses','assets')
->make();
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index 729d258645..175345188b 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -39,6 +39,8 @@
Lang::get('admin/users/table.manager'),
Lang::get('general.assets'),
Lang::get('general.licenses'),
+ Lang::get('general.accessories'),
+ Lang::get('general.groups'),
Lang::get('admin/users/table.activated'),
Lang::get('table.actions')
)