Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into feature/pg-fulltext-search

Roland Geider4cda06b2ccfa
diff --cc wger/exercises/api/views.py
index 16b1eaf02,d7e5b040f..0f326ef60
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@@ -380,11 -373,11 +378,11 @@@ def search(request)
'name': translation.name,
'category': _(translation.category.name),
'image': image,
- 'image_thumbnail': thumbnail
- }
+ 'image_thumbnail': thumbnail,
+ },
}
results.append(result_json)
- response['suggestions'] = results
+ response["suggestions"] = results
return Response(response)
diff --cc wger/exercises/models/exercise.py
index 0ca2a8e9b,e0d1721f7..390865ed7
--- a/wger/exercises/models/exercise.py
+++ b/wger/exercises/models/exercise.py
@@@ -105,9 -105,8 +106,9 @@@ class Exercise(AbstractLicenseModel, Ab
class Meta:
base_manager_name = 'objects'
ordering = [
- "name",
+ 'name',
]
+ indexes = (GinIndex(fields=["name"]),)
def get_absolute_url(self):
"""
diff --cc wger/exercises/tests/test_sync.py
index 852a5a0f2,a5cb4df05..5b12fb70c
--- a/wger/exercises/tests/test_sync.py
+++ b/wger/exercises/tests/test_sync.py
@@@ -567,15 -555,11 +560,14 @@@ class MockExerciseResponse
class TestSyncMethods(WgerTestCase):
-
@patch('requests.get', return_value=MockLanguageResponse())
def test_language_sync(self, mock_request):
+ language1 = Language.objects.get(pk=1)
self.assertEqual(Language.objects.count(), 3)
- self.assertEqual(Language.objects.get(pk=1).full_name, 'Deutsch')
+ self.assertEqual(language1.full_name, 'Deutsch')
+ self.assertEqual(language1.full_name_en, 'German')
+ # Act
sync_languages(lambda x: x)
mock_request.assert_called_with(
'https://wger.de/api/v2/language/',