Merge branch '179-ordering' into 'develop'

Resolve "Cannot order by ascending"

Closes #179

See merge request funkwhale/funkwhale!206

api/funkwhale_api/music/views.py

@@ -153,11 +153,11 @@ class TrackViewSet(TagViewSetMixin, viewsets.ReadOnlyModelViewSet):
     filter_class = filters.TrackFilter
     ordering_fields = (
         'creation_date',
-        'title__unaccent',
-        'album__title__unaccent',
+        'title',
+        'album__title',
         'album__release_date',
         'position',
-        'artist__name__unaccent',
+        'artist__name',
     )
 
     def get_queryset(self):

changes/changelog.d/179.bugfix

+Fixed broken ordering in front-end lists (#179)

front/src/components/favorites/List.vue

@@ -26,7 +26,7 @@
           <div class="field">
             <i18next tag="label" path="Ordering direction"/>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value=""><i18next path="Ascending"/></option>
+              <option value="+"><i18next path="Ascending"/></option>
               <option value="-"><i18next path="Descending"/></option>
             </select>
           </div>
@@ -74,7 +74,7 @@ export default {
     Pagination
   },
   data () {
-    let defaultOrdering = this.getOrderingFromString(this.defaultOrdering || 'artist__name')
+    let defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
     return {
       results: null,
       isLoading: false,
@@ -82,9 +82,10 @@ export default {
       previousLink: null,
       page: parseInt(this.defaultPage),
       paginateBy: parseInt(this.defaultPaginateBy || 25),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
+        ['creation_date', 'Creation date'],
         ['title', 'Track name'],
         ['album__title', 'Album name'],
         ['artist__name', 'Artist name']

front/src/components/library/Artists.vue

@@ -19,7 +19,7 @@
           <div class="field">
             <i18next tag="label" path="Ordering direction"/>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value="">Ascending</option>
+              <option value="+">Ascending</option>
               <option value="-">Descending</option>
             </select>
           </div>
@@ -95,7 +95,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 12),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
         ['creation_date', 'Creation date'],

front/src/components/library/Radios.vue

@@ -23,7 +23,7 @@
           <div class="field">
             <i18next tag="label" path="Ordering direction"/>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value=""><i18next path="Ascending"/></option>
+              <option value="+"><i18next path="Ascending"/></option>
               <option value="-"><i18next path="Descending"/></option>
             </select>
           </div>
@@ -99,7 +99,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 12),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
         ['creation_date', 'Creation date'],

front/src/components/mixins/Ordering.vue

@@ -13,13 +13,17 @@ export default {
         }
       } else {
         return {
-          direction: '',
+          direction: '+',
           field: s
         }
       }
     },
     getOrderingAsString () {
-      return [this.orderingDirection, this.ordering].join('')
+      let direction = this.orderingDirection
+      if (direction === '+') {
+        direction = ''
+      }
+      return [direction, this.ordering].join('')
     }
   }
 }

front/src/components/requests/RequestsList.vue

@@ -29,7 +29,7 @@
           <div class="field">
             <label>{{ $t('Ordering direction') }}</label>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value="">Ascending</option>
+              <option value="+">Ascending</option>
               <option value="-">Descending</option>
             </select>
           </div>
@@ -106,7 +106,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 12),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       status: this.defaultStatus || 'any'
     }

front/src/views/federation/LibraryList.vue

@@ -26,7 +26,7 @@
           <div class="field">
             <label>{{ $t('Ordering direction') }}</label>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value="">{{ $t('Ascending') }}</option>
+              <option value="+">{{ $t('Ascending') }}</option>
               <option value="-">{{ $t('Descending') }}</option>
             </select>
           </div>
@@ -102,7 +102,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 50),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
         ['creation_date', 'Creation date'],

front/src/views/playlists/List.vue

@@ -25,7 +25,7 @@
           <div class="field">
             <label>{{ $t('Ordering direction') }}</label>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value="">{{ $t('Ascending') }}</option>
+              <option value="+">{{ $t('Ascending') }}</option>
               <option value="-">{{ $t('Descending') }}</option>
             </select>
           </div>
@@ -83,7 +83,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 12),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
         ['creation_date', 'Creation date'],