ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110 from flashingcursor/develop

Browse Source 
Started implementing Datatables ... User table partially implemented.
This commit is contained in:
snipe
2013-12-02 03:09:10 -08:00
parent dddba1198d a0267db832
commit cfd6c4301c
5 changed files with 89 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+36
View File
@@ -14,3 +14,39 @@ composer.phar
/app/config/*/app.php
/app/config/testing/database.php
public/packages/barryvdh/laravel-debugbar/debugbar.css
public/packages/barryvdh/laravel-debugbar/debugbar.js
public/packages/barryvdh/laravel-debugbar/icons.png
public/packages/barryvdh/laravel-debugbar/openhandler.css
public/packages/barryvdh/laravel-debugbar/openhandler.js
public/packages/barryvdh/laravel-debugbar/php-icon.png
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/css/font-awesome-ie7.css
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/css/font-awesome-ie7.min.css
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/css/font-awesome.css
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/css/font-awesome.min.css
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/font/FontAwesome.otf
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/font/fontawesome-webfont.eot
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/font/fontawesome-webfont.svg
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/font/fontawesome-webfont.ttf
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/font/fontawesome-webfont.woff
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/less/bootstrap.less
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/less/core.less
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/less/extras.less
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/less/font-awesome-ie7.less
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/less/font-awesome.less
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/less/icons.less
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/less/mixins.less
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/less/path.less
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/less/variables.less
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/scss/_bootstrap.scss
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/scss/_core.scss
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/scss/_extras.scss
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/scss/_icons.scss
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/scss/_mixins.scss
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/scss/_path.scss
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/scss/_variables.scss
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/scss/font-awesome-ie7.scss
public/packages/barryvdh/laravel-debugbar/vendor/font-awesome/scss/font-awesome.scss
public/packages/barryvdh/laravel-debugbar/vendor/jquery-1.8.3.min.js
public/packages/barryvdh/laravel-debugbar/widgets.css
public/packages/barryvdh/laravel-debugbar/widgets.js
app/controllers/admin/UsersController.php
+35
View File
@@ -5,6 +5,8 @@ use Cartalyst\Sentry\Users\LoginRequiredException;
use Cartalyst\Sentry\Users\PasswordRequiredException;
use Cartalyst\Sentry\Users\UserExistsException;
use Cartalyst\Sentry\Users\UserNotFoundException;
use HTML;
use URL;
use Config;
use DB;
use Input;
@@ -18,6 +20,7 @@ use Redirect;
use Sentry;
use Validator;
use View;
use Chumper\Datatable\Facades\Datatable;
class UsersController extends AdminController {
@@ -448,4 +451,36 @@ class UsersController extends AdminController {
}
public function getDatatable()
{
return Datatable::collection(User::all())
->addColumn('name',function($model)
{
$name = HTML::image($model->gravatar(), $model->first_name, array('class'=>'img-circle avatar hidden-phone', 'style'=>'max-width: 45px'));
$name .= HTML::link(URL::action('Controllers\Admin\UsersController@getView', $model->id), $model->first_name . ' ' . $model->last_name, array('class' => 'name'));
return $name;
}
)
->showColumns('email')
->addColumn('assets', function($model)
{
$assets = $model->assets->count();
return $assets;
}
)
->addColumn('licenses', function($model)
{
$licenses = $model->licenses->count();
return $licenses;
}
)
->addColumn('activated', function($model)
{
$activated = $model->isActivated() ? '<i class="icon-ok"></i>' : '';
return $activated;
}
)
->make();
}
}
app/models/User.php
+1 -1
View File
@@ -30,7 +30,7 @@ class User extends SentryUserModel {
public function gravatar()
{
// Generate the Gravatar hash
$gravatar = md5(strtolower(trim($this->gravatar)));
$gravatar = md5(strtolower(trim($this->email)));
// Return the Gravatar url
return "//gravatar.com/avatar/{$gravatar}";
app/routes.php
+2
View File
@@ -162,6 +162,8 @@ Route::group(array('prefix' => 'admin'), function()
Route::get('{userId}/delete', array('as' => 'delete/user', 'uses' => 'Controllers\Admin\UsersController@getDelete'));
Route::get('{userId}/restore', array('as' => 'restore/user', 'uses' => 'Controllers\Admin\UsersController@getRestore'));
Route::get('{userId}/view', array('as' => 'view/user', 'uses' => 'Controllers\Admin\UsersController@getView'));
Route::get('datatable', array('as'=>'api.users', 'uses'=>'Controllers\Admin\UsersController@getDatatable'));
});
# Group Management
app/views/backend/users/index.blade.php
+15 -1
View File
@@ -32,7 +32,7 @@ User Management ::
<div class="row form-wrapper">
@if ($users->getTotal() > 0)
<div class="row-fluid table users-list">
<!-- <div class="row-fluid table users-list">
<table id="example">
<thead>
<tr role="row">
@@ -78,7 +78,21 @@ User Management ::
</tbody>
</table>
</div>
-->
{{
Datatable::table()
->addColumn(Lang::get('name'))
->addColumn(Lang::get('email'))
->addColumn('Assets')
->addColumn('Licenses')
->addColumn(Lang::get('activated'))
->setUrl(route('api.users'))
->render()
}}
@else
<div class="col-md-6">
<div class="alert alert-warning alert-block">
<i class="icon-warning-sign"></i>