Expose both image/and thumbnail in references too (fix #824)

opendatateam · Apr 23, 2017 · 4a005ea · 4a005ea
1 parent 5dd14bb
commit 4a005ea
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
   [#877](https://github.com/opendatateam/udata/pull/877)
 - Fix new issue submission
   [#874](https://github.com/opendatateam/udata/issues/874)
+- Display full images/logo/avatars URL in references too
+  [#824](https://github.com/opendatateam/udata/issues/824)
 
 ## 1.0.8 (2017-04-14)
 

diff --git a/js/components/dataset/card.vue b/js/components/dataset/card.vue
@@ -103,10 +103,10 @@ export default {
     },
     computed: {
         logo() {
-            if (!this.dataset || !this.dataset.organization || !this.dataset.organization.logo) {
+            if (!this.dataset || !this.dataset.organization || !this.dataset.organization.logo_thumbnail) {
                 return placeholders.organization;
             }
-            return this.dataset.organization.logo;
+            return this.dataset.organization.logo_thumbnail;
         },
         certified() {
             return `${config.theme_static}img/certified-stamp.png`;

diff --git a/js/components/sidebar.vue b/js/components/sidebar.vue
@@ -105,7 +105,7 @@ export default {
             return this.$root.me.organizations.map(function(org) {
                 return {
                     label: org.acronym || org.name,
-                    image: org.logo,
+                    image: org.logo_thumbnail,
                     route: '/organization/' + org.id + '/',
                     children: [{
                         label: Vue._('Dataset'),

diff --git a/udata/core/organization/api_fields.py b/udata/core/organization/api_fields.py
@@ -21,8 +21,11 @@
     'page': fields.UrlFor(
         'organizations.show', lambda o: {'org': o},
         description='The organization web page URL', readonly=True),
-    'logo': fields.ImageField(size=BIGGEST_LOGO_SIZE,
+    'logo': fields.ImageField(original=True,
         description='The organization logo URL'),
+    'logo_thumbnail': fields.ImageField(attribute='logo', size=BIGGEST_LOGO_SIZE,
+        description='The organization logo thumbnail URL. This is the square '
+        '({0}x{0}) and cropped version.'.format(BIGGEST_LOGO_SIZE)),
 })
 
 

diff --git a/udata/core/reuse/api_fields.py b/udata/core/reuse/api_fields.py
@@ -78,8 +78,10 @@
 
 reuse_ref_fields = api.inherit('ReuseReference', base_reference, {
     'title': fields.String(description='The reuse title', readonly=True),
-    'image': fields.ImageField(size=BIGGEST_IMAGE_SIZE,
-        description='The reuse thumbnail'),
+    'image': fields.ImageField(description='The reuse thumbnail thumbnail (cropped) URL'),
+    'image_thumbnail': fields.ImageField(attribute='image', size=BIGGEST_IMAGE_SIZE,
+        description='The reuse thumbnail thumbnail URL. This is the square '
+        '({0}x{0}) and cropped version.'.format(BIGGEST_IMAGE_SIZE)),
     'uri': fields.UrlFor(
         'api.reuse', lambda o: {'reuse': o},
         description='The reuse API URI', readonly=True),

diff --git a/udata/core/user/api_fields.py b/udata/core/user/api_fields.py
@@ -21,8 +21,11 @@
     'uri': fields.UrlFor(
         'api.user', lambda o: {'user': o},
         description='The user API URI', required=True),
-    'avatar': fields.ImageField(size=BIGGEST_AVATAR_SIZE,
+    'avatar': fields.ImageField(original=True,
         description='The user avatar URL'),
+    'avatar_thumbnail': fields.ImageField(attribute='avatar', size=BIGGEST_AVATAR_SIZE,
+        description='The user avatar thumbnail URL. This is the square '
+        '({0}x{0}) and cropped version.'.format(BIGGEST_AVATAR_SIZE)),
 })