Sorting in albums should be rather "dateTaken,asc"

[ghost]

Hi guys, this is definitely not very clean way of doing it (that's why I'm not sending it as git push request), but here is the idea: Let's serve photos for albums in different order according to "album" filter, before somebody makes the option to select sorting method for every album. Or not?

diff --git a/src/libraries/adapters/DatabaseMySql.php b/src/libraries/adapters/DatabaseMySql.php
index 0d4ee21..ebc597e 100644
--- a/src/libraries/adapters/DatabaseMySql.php
+++ b/src/libraries/adapters/DatabaseMySql.php
@@ -1712,6 +1712,8 @@ class DatabaseMySql implements DatabaseInterface
             if($value === 'dateTaken,desc')
               $sortBy = 'ORDER BY dateSortByDay DESC';
             elseif($value === 'dateTaken,asc')
+              $sortBy = 'ORDER BY dateTaken ASC';
+            elseif($value === 'dateTaken,asc')
               $sortBy = 'ORDER BY dateSortByDay ASC';
             elseif($value === 'dateUploaded,desc')
               $sortBy = 'ORDER BY dateSortByDay DESC, dateUploaded ASC';
diff --git a/src/libraries/controllers/ApiPhotoController.php b/src/libraries/controllers/ApiPhotoController.php
index a17bf9a..fd64157 100644
--- a/src/libraries/controllers/ApiPhotoController.php
+++ b/src/libraries/controllers/ApiPhotoController.php
@@ -241,6 +241,11 @@ class ApiPhotoController extends ApiBaseController
   {
     // this extracts local variables $permission, $filter, $pageSize, etc
     extract($this->parseFilters($filterOpts));
+
+    // fix for sorting in albums
+    if(isset($filters['album']))
+      $filters['sortBy'] = 'dateTaken,asc';
+
     $db = getDb();
     $photos = $db->getPhotos($filters, $pageSize);

[hfiguiere]

When I read the whole block you modified things in, I believe it is all wrong.

[hfiguiere]

          case 'sortBy':
            if($value === 'dateTaken,desc')
              $sortBy = 'ORDER BY dateSortByDay DESC';
            elseif($value === 'dateTaken,asc')
              $sortBy = 'ORDER BY dateSortByDay ASC';

You should change BOTH if()

            elseif($value === 'dateUploaded,desc')
              $sortBy = 'ORDER BY dateSortByDay DESC, dateUploaded ASC';
            elseif($value === 'dateUploaded,asc')
              $sortBy = 'ORDER BY dateSortByDay ASC, dateUploaded ASC';

And here too.

            else
              $sortBy = 'ORDER BY ' . $this->_(str_replace(',', ' ', $value));

[hfiguiere]

Btw this is bug #735 and bug #1339

[ghost]

Sort of, but actually dateTaken,desc in my code is not oposite to dateTaken,asc. (!)

I know about #735, but the proposed solution there is too complex. I missed #1339, sorry.

[jmathai]

Taking a step back and opening this up for discussion with the hopes that we can decide on a good default based on all the perspectives we get. #1341

[hfiguiere]

And this because the previous commit is nowhere to be found.
upstream/4.0.2-rc3
upstream/gh-1402

Then

• [would prune] upstream/4.0.2-rc3
• [would prune] upstream/API response does not always honor documented data types #1402

[hfiguiere]

The fix above is actually for bug #1286.