]>
Commit | Line | Data |
---|---|---|
1 | diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php | |
2 | index a9fd4c74..7a07bd64 100644 | |
3 | --- a/app/Http/Controllers/DashboardController.php | |
4 | +++ b/app/Http/Controllers/DashboardController.php | |
5 | @@ -83,9 +83,9 @@ class DashboardController extends Controller | |
6 | ||
7 | $groups = $groups->with('tags', 'users', 'actions', 'discussions') | |
8 | ->orderBy('status', 'desc') | |
9 | - ->orderBy('updated_at', 'desc'); | |
10 | + ->orderBy('name', 'asc'); | |
11 | ||
12 | - $groups = $groups->paginate(20)->appends(request()->query()); | |
13 | + $groups = $groups->paginate(40)->appends(request()->query()); | |
14 | ||
15 | ||
16 | ||
17 | diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php | |
18 | index 13c5cfa4..9acc7af8 100644 | |
19 | --- a/app/Http/Controllers/GroupController.php | |
20 | +++ b/app/Http/Controllers/GroupController.php | |
21 | @@ -27,7 +27,7 @@ class GroupController extends Controller | |
22 | ||
23 | $groups = $groups->with('tags', 'users', 'actions', 'discussions') | |
24 | ->orderBy('status', 'desc') | |
25 | - ->orderBy('updated_at', 'desc'); | |
26 | + ->orderBy('name', 'asc'); | |
27 | ||
28 | if (Auth::check()) { | |
29 | $groups = $groups->with('membership'); | |
30 | @@ -37,7 +37,7 @@ class GroupController extends Controller | |
31 | $groups = $groups->search($request->get('search')); | |
32 | } | |
33 | ||
34 | - $groups = $groups->paginate(20)->appends(request()->query()); | |
35 | + $groups = $groups->paginate(40)->appends(request()->query()); | |
36 | ||
37 | return view('dashboard.groups') | |
38 | ->with('tab', 'groups') | |
39 | diff --git a/resources/views/actions/create.blade.php b/resources/views/actions/create.blade.php | |
40 | index 987db39e..740b833e 100644 | |
41 | --- a/resources/views/actions/create.blade.php | |
42 | +++ b/resources/views/actions/create.blade.php | |
43 | @@ -36,7 +36,7 @@ | |
44 | {!! Form::close() !!} | |
45 | ||
46 | @else | |
47 | - {!! Form::model($action, array('action' => ['GroupActionController@store', $group])) !!} | |
48 | + {!! Form::open(array('route' => ['groups.actions.store', $group])) !!} | |
49 | ||
50 | @include('actions.form') | |
51 | ||
52 |