@@ -21,11 +21,24 @@ class GalleryController extends Controller {
2121 */
2222 public function getSubmissionIndex (Request $ request , $ status = null ) {
2323 $ submissions = GallerySubmission::collaboratorApproved ()->where ('status ' , $ status ? ucfirst ($ status ) : 'Pending ' );
24- if ($ request ->get ('gallery_id ' )) {
25- $ submissions ->where (function ($ query ) use ($ request ) {
26- $ query ->where ('gallery_id ' , $ request ->get ('gallery_id ' ));
24+ $ data = $ request ->only (['gallery_id ' , 'sort ' ]);
25+ if (isset ($ data ['gallery_id ' ])) {
26+ $ submissions ->where (function ($ query ) use ($ data ) {
27+ $ query ->where ('gallery_id ' , $ data ['gallery_id ' ]);
2728 });
2829 }
30+ if (isset ($ data ['sort ' ])) {
31+ switch ($ data ['sort ' ]) {
32+ case 'newest ' :
33+ $ submissions ->sortNewest ();
34+ break ;
35+ case 'oldest ' :
36+ $ submissions ->sortOldest ();
37+ break ;
38+ }
39+ } else {
40+ $ submissions ->sortOldest ();
41+ }
2942 if ($ status == 'pending ' || !$ status ) {
3043 $ submissions = $ submissions ->orderBy ('created_at ' , 'ASC ' );
3144 } else {
@@ -47,11 +60,24 @@ public function getSubmissionIndex(Request $request, $status = null) {
4760 */
4861 public function getCurrencyIndex (Request $ request , $ status = null ) {
4962 $ submissions = GallerySubmission::requiresAward ()->where ('is_valued ' , !$ status || $ status == 'pending ' ? 0 : 1 );
50- if ($ request ->get ('gallery_id ' )) {
51- $ submissions ->where (function ($ query ) use ($ request ) {
52- $ query ->where ('gallery_id ' , $ request ->get ('gallery_id ' ));
63+ $ data = $ request ->only (['gallery_id ' , 'sort ' ]);
64+ if (isset ($ data ['gallery_id ' ])) {
65+ $ submissions ->where (function ($ query ) use ($ data ) {
66+ $ query ->where ('gallery_id ' , $ data ['gallery_id ' ]);
5367 });
5468 }
69+ if (isset ($ data ['sort ' ])) {
70+ switch ($ data ['sort ' ]) {
71+ case 'newest ' :
72+ $ submissions ->sortNewest ();
73+ break ;
74+ case 'oldest ' :
75+ $ submissions ->sortOldest ();
76+ break ;
77+ }
78+ } else {
79+ $ submissions ->sortOldest ();
80+ }
5581 if ($ status == 'pending ' || !$ status ) {
5682 $ submissions = $ submissions ->orderBy ('created_at ' , 'ASC ' );
5783 } else {
0 commit comments