Merge pull request #939 from dpfaffenbauer/issue/937

[AddressBundle] use isoCode fallback if there is no language translation
coreshop · Apr 10, 2019 · 271bdf0 · 271bdf0
2 parents 246b5c9 + c8650d0
commit 271bdf0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/config/serializer/Model.Country.yml b/src/CoreShop/Bundle/AddressBundle/Resources/config/serializer/Model.Country.yml
@@ -9,7 +9,7 @@ CoreShop\Component\Address\Model\Country:
         isoCode:
             expose: true
             type: string
-            groups: [Detailed]
+            groups: [List, Detailed]
         active:
             expose: true
             type: boolean
@@ -36,4 +36,4 @@ CoreShop\Component\Address\Model\Country:
             groups: [List, Detailed]
         getName:
             serialized_name: name
-            groups: [List, Detailed]
+            groups: [List, Detailed]
diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/panel.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/panel.js
@@ -49,6 +49,12 @@ coreshop.country.panel = Class.create(coreshop.resource.panel, {
         $super();
     },
 
+    getGridDisplayColumnRenderer: function (value, metadata, record) {
+        metadata.tdAttr = 'data-qtip="ID: ' + record.get('id') + '"';
+
+        return value ? value : record.get('isoCode');
+    },
+
     getGridConfiguration: function () {
         return {
             store: this.store,