diff options
author | Andreas Gohr <andi@splitbrain.org> | 2013-08-04 03:36:58 -0700 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2013-08-04 03:36:58 -0700 |
commit | 9ead67782d3bf9976a4bd1f0d748d59094ed6bd6 (patch) | |
tree | 05c9f477c4b9106f11fae8cfbe88dcd10394256b /lib | |
parent | 4597d90e72d68722de1ad9c0b63f316479c8767a (diff) | |
parent | c84391dcf5eb8a23bcae9e558285975c6b47e7f1 (diff) | |
download | rpg-9ead67782d3bf9976a4bd1f0d748d59094ed6bd6.tar.gz rpg-9ead67782d3bf9976a4bd1f0d748d59094ed6bd6.tar.bz2 |
Merge pull request #263 from splitbrain/mediamanager_list_ordering
Mediamanager list ordering
Diffstat (limited to 'lib')
-rw-r--r-- | lib/exe/ajax.php | 3 | ||||
-rw-r--r-- | lib/scripts/fileuploaderextended.js | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 9769503a7..6e2011cd9 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -219,10 +219,11 @@ function ajax_medialist(){ global $INPUT; $NS = cleanID($INPUT->post->str('ns')); + $sort = $INPUT->post->bool('recent') ? 'date' : 'natural'; if ($INPUT->post->str('do') == 'media') { tpl_mediaFileList(); } else { - tpl_mediaContent(true); + tpl_mediaContent(true, $sort); } } diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js index 0ba7a0525..f5786c387 100644 --- a/lib/scripts/fileuploaderextended.js +++ b/lib/scripts/fileuploaderextended.js @@ -188,6 +188,7 @@ qq.extend(qq.FileUploaderExtended.prototype, { if (i) action = action.substr(0, i); var button = '<form method="post" action="' + action + '" id="mediamanager__done_form"><div>'; button += '<input type="hidden" value="' + result.ns + '" name="ns">'; + button += '<input type="hidden" value="1" name="recent">'; button += '<input class="button" type="submit" value="' + LANG.media_done_btn + '"></div></form>'; jQuery('#mediamanager__uploader').append(button); } |