# HG changeset patch # User ymh # Date 1476196751 -7200 # Node ID 13564bb13ccc9a584b6dafc646cfd40a742b6c5f # Parent 226d5b17a119bcb5309e0c1453d9c7261f2fb1f7 In the serialized document the lan files id 'languages' and not 'language' diff -r 226d5b17a119 -r 13564bb13ccc cms/app-client/app/models/document.js --- a/cms/app-client/app/models/document.js Tue Oct 11 02:49:59 2016 +0200 +++ b/cms/app-client/app/models/document.js Tue Oct 11 16:39:11 2016 +0200 @@ -7,7 +7,7 @@ uri: DS.attr('string'), issued: DS.attr('date'), title: DS.attr('string'), - language: DS.attr({ defaultValue: function() { return []; } }), + languages: DS.attr({ defaultValue: function() { return []; } }), publisher: DS.attr('string'), transcript_url: DS.attr('string'), transcript: DS.attr({ defaultValue: function() { return {}; } }), diff -r 226d5b17a119 -r 13564bb13ccc cms/app-client/app/templates/components/notice-component.hbs --- a/cms/app-client/app/templates/components/notice-component.hbs Tue Oct 11 02:49:59 2016 +0200 +++ b/cms/app-client/app/templates/components/notice-component.hbs Tue Oct 11 16:39:11 2016 +0200 @@ -17,7 +17,7 @@ Langue - {{#each item.language as |lang index|}}{{if index ", "}}{{doc-language url=lang class="language"}}{{/each}} + {{#each item.languages as |lang index|}}{{if index ", "}}{{doc-language url=lang class="language"}}{{/each}} Sujet{{#if (if-operator item.computedSubjects.length '>' 1)}}s{{/if}} diff -r 226d5b17a119 -r 13564bb13ccc cms/app-client/app/templates/components/player-component.hbs --- a/cms/app-client/app/templates/components/player-component.hbs Tue Oct 11 02:49:59 2016 +0200 +++ b/cms/app-client/app/templates/components/player-component.hbs Tue Oct 11 16:39:11 2016 +0200 @@ -28,7 +28,7 @@

{{ item.title }} - {{#each model.language as |lang index|}}{{if index ", "}}{{doc-language url=lang class="language"}}{{/each}} + {{#each model.languages as |lang index|}}{{if index ", "}}{{doc-language url=lang class="language"}}{{/each}}

{{item.publishers_disp}} diff -r 226d5b17a119 -r 13564bb13ccc cms/app-client/app/templates/components/playlist-component.hbs --- a/cms/app-client/app/templates/components/playlist-component.hbs Tue Oct 11 02:49:59 2016 +0200 +++ b/cms/app-client/app/templates/components/playlist-component.hbs Tue Oct 11 16:39:11 2016 +0200 @@ -19,7 +19,7 @@ {{ document.title }}

{{document.publishers_disp}} - {{#each model.language as |lang index|}}{{if index ", "}}{{doc-language url=lang class="language"}}{{/each}} + {{#each model.languages as |lang index|}}{{if index ", "}}{{doc-language url=lang class="language"}}{{/each}}
{{/each}} diff -r 226d5b17a119 -r 13564bb13ccc cms/app-client/app/templates/tabs/detail.hbs --- a/cms/app-client/app/templates/tabs/detail.hbs Tue Oct 11 02:49:59 2016 +0200 +++ b/cms/app-client/app/templates/tabs/detail.hbs Tue Oct 11 16:39:11 2016 +0200 @@ -4,7 +4,7 @@

Titre {{model.title}}

-

Langue {{#each model.language as |lang index|}}{{if index ", "}}{{doc-language url=lang}}{{/each}}

+

Langue {{#each model.languages as |lang index|}}{{if index ", "}}{{doc-language url=lang}}{{/each}}

Enregistré le {{model.modified}}

Interviewer {{model.publishers_disp}}

Description {{model.description}}

diff -r 226d5b17a119 -r 13564bb13ccc cms/app-client/mirage/fixtures/documents.js --- a/cms/app-client/mirage/fixtures/documents.js Tue Oct 11 02:49:59 2016 +0200 +++ b/cms/app-client/mirage/fixtures/documents.js Tue Oct 11 16:39:11 2016 +0200 @@ -3,7 +3,7 @@ "id": "11280.100/crdo-UVE_MOCIKA_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-UVE_MOCIKA_SOUND", "title": "The two hermit crabs and the coconut crab", - "language": [ "http://lexvo.org/id/iso639-3/uve" ], + "languages": [ "http://lexvo.org/id/iso639-3/uve" ], "modified": "2002-02-20", "issued": "2010-10-23T00:08:27+02:00", "publishers": [ @@ -82,7 +82,7 @@ "id": "11280.100/crdo-CFPP2000_11_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-CFPP2000_11_SOUND", "title": "Entretien de Louise Liotard et de Jeane Mallet 1", - "language": [ "http://lexvo.org/id/iso639-3/fra" ], + "languages": [ "http://lexvo.org/id/iso639-3/fra" ], "modified": "2013-04-23T21:40:30+02:00", "issued": "2013-04-23T21:40:30+02:00", "publishers": [ @@ -274,7 +274,7 @@ "id": "11280.100/crdo-FRA_PK_IV_10_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-FRA_PK_IV_10_SOUND", "title": "Le jour des petits (B)", - "language": ["http://lexvo.org/id/iso639-3/fra"], + "languages": ["http://lexvo.org/id/iso639-3/fra"], "modified": "2007-11-06", "issued": "2010-10-27T10:41:51+02:00", "publishers": [ @@ -534,7 +534,7 @@ "id": "11280.100/crdo-FSL-CUC023_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-FSL-CUC023_SOUND", "title": "Corpus LS-Colin sur plusieurs genres discursifs (Josette Bouchauveau et Henri Attia)", - "language": ["http://lexvo.org/id/iso639-3/fra", "http://lexvo.org/id/iso639-3/fsl"], + "languages": ["http://lexvo.org/id/iso639-3/fra", "http://lexvo.org/id/iso639-3/fsl"], "modified": "2008-06-14", "issued": "2015-02-03T21:13:34+01:00", "publishers": [ @@ -791,7 +791,7 @@ "id": "11280.100/crdo-NEE_KHIAAK_KO_AK_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-NEE_KHIAAK_KO_AK_SOUND", "title": "Tale of the hen and the rooster", - "language": ["http://lexvo.org/id/iso639-3/fra", "http://lexvo.org/id/iso639-3/nee"], + "languages": ["http://lexvo.org/id/iso639-3/fra", "http://lexvo.org/id/iso639-3/nee"], "modified": "2004-12-09", "issued": "2010-10-26T19:21:17+02:00", "publishers": [ @@ -892,7 +892,7 @@ "id": "11280.100/crdo-ESLO1_ENT_047", "uri": "https://hdl.handle.net/11280.100/crdo-ESLO1_ENT_047", "title": "ESLO1: entretien 047", - "language": ["http://lexvo.org/id/iso639-3/fra"], + "languages": ["http://lexvo.org/id/iso639-3/fra"], "modified": "2014-11-04", "issued": "2014-12-05T15:05:08+01:00", "publishers": [ @@ -1026,7 +1026,7 @@ "id": "11280.100/crdo-09-CAYCHAX_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-CAYCHAX_SOUND", "title": "ALLOc : Caychax : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:16:38+02:00", "issued": "2010-10-25T18:16:38+02:00", "publishers": [ @@ -1148,7 +1148,7 @@ "id": "11280.100/crdo-09-DUN_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-DUN_SOUND", "title": "ALLOc : Dun : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:18:23+02:00", "issued": "2010-10-25T18:18:23+02:00", "publishers": [ @@ -1270,7 +1270,7 @@ "id": "11280.100/crdo-09-LABASTIDE-DE-LORDAT_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-LABASTIDE-DE-LORDAT_SOUND", "title": "ALLOc : La Bastide-de-Lordat : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:20:08+02:00", "issued": "2010-10-25T18:20:08+02:00", "publishers": [ @@ -1392,7 +1392,7 @@ "id": "11280.100/crdo-09-LOUBENS_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-LOUBENS_SOUND", "title": "ALLOc : Loubens : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:21:23+02:00", "issued": "2010-10-25T18:21:23+02:00", "publishers": [ @@ -1514,7 +1514,7 @@ "id": "11280.100/crdo-09-MERENS-LES-VALS_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-MERENS-LES-VALS_SOUND", "title": "ALLOc : Mérens-les-Vals : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:22:24+02:00", "issued": "2010-10-25T18:22:24+02:00", "publishers": [ @@ -1636,7 +1636,7 @@ "id": "11280.100/crdo-09-MONTSEGUR_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-MONTSEGUR_SOUND", "title": "ALLOc : Montségur : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:23:14+02:00", "issued": "2010-10-25T18:23:14+02:00", "publishers": [ @@ -1758,7 +1758,7 @@ "id": "11280.100/crdo-09-PRAYOLS_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-PRAYOLS_SOUND", "title": "ALLOc : Prayols : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:24:06+02:00", "issued": "2010-10-25T18:24:06+02:00", "publishers": [ @@ -1870,7 +1870,7 @@ "id": "11280.100/crdo-09-QUERIGUT_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-QUERIGUT_SOUND", "title": "ALLOc : Quérigut : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:24:56+02:00", "issued": "2010-10-25T18:24:56+02:00", "publishers": [ @@ -1992,7 +1992,7 @@ "id": "11280.100/crdo-09-SIGUER_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-SIGUER_SOUND", "title": "ALLOc : Siguer : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:25:51+02:00", "issued": "2010-10-25T18:25:51+02:00", "publishers": [ @@ -2114,7 +2114,7 @@ "id": "11280.100/crdo-09-ST-MARTIN-D-OYDES_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-ST-MARTIN-D-OYDES_SOUND", "title": "ALLOc : Saint-Martin-d'Oydes : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:26:22+02:00", "issued": "2010-10-25T18:26:22+02:00", "publishers": [ @@ -2236,7 +2236,7 @@ "id": "11280.100/crdo-09-SURBA_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-09-SURBA_SOUND", "title": "ALLOc : Surba : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:26:42+02:00", "issued": "2010-10-25T18:26:42+02:00", "publishers": [ @@ -2358,7 +2358,7 @@ "id": "11280.100/crdo-11-GRAMAZIE_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-11-GRAMAZIE_SOUND", "title": "ALLOc : Gramazie : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:27:39+02:00", "issued": "2010-10-25T18:27:39+02:00", "publishers": [ @@ -2480,7 +2480,7 @@ "id": "11280.100/crdo-11-MOLLEVILLE_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-11-MOLLEVILLE_SOUND", "title": "ALLOc : Molleville : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:28:06+02:00", "issued": "2010-10-25T18:28:06+02:00", "publishers": [ @@ -2602,7 +2602,7 @@ "id": "11280.100/crdo-11-PUIVERT_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-11-PUIVERT_SOUND", "title": "ALLOc : Puivert : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:28:40+02:00", "issued": "2010-10-25T18:28:40+02:00", "publishers": [ @@ -2724,7 +2724,7 @@ "id": "11280.100/crdo-11-RIBOUISSE_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-11-RIBOUISSE_SOUND", "title": "ALLOc : Ribouisse : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:29:32+02:00", "issued": "2010-10-25T18:29:32+02:00", "publishers": [ @@ -2846,7 +2846,7 @@ "id": "11280.100/crdo-11-SONNAC-SUR-L-HERS_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-11-SONNAC-SUR-L-HERS_SOUND", "title": "ALLOc : Sonnac-sur-l'Hers : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:29:56+02:00", "issued": "2010-10-25T18:29:56+02:00", "publishers": [ @@ -2963,7 +2963,7 @@ "id": "11280.100/crdo-11-ST-MARTIN-LALANDE_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-11-ST-MARTIN-LALANDE_SOUND", "title": "ALLOc : Saint-Martin-Lalande : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:30:27+02:00", "issued": "2010-10-25T18:30:27+02:00", "publishers": [ @@ -3085,7 +3085,7 @@ "id": "11280.100/crdo-12-AUZITS_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-AUZITS_SOUND", "title": "ALLOc : Auzits : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:31:22+02:00", "issued": "2010-10-25T18:31:22+02:00", "publishers": [ @@ -3207,7 +3207,7 @@ "id": "11280.100/crdo-12-JOUELS_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-JOUELS_SOUND", "title": "ALLOc : Jouels : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:31:21+02:00", "issued": "2010-10-25T18:31:21+02:00", "publishers": [ @@ -3329,7 +3329,7 @@ "id": "11280.100/crdo-12-LACASSAGNE_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-LACASSAGNE_SOUND", "title": "ALLOc : Lacassagne : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:31:43+02:00", "issued": "2010-10-25T18:31:43+02:00", "publishers": [ @@ -3453,7 +3453,7 @@ "id": "11280.100/crdo-12-LANUEJOULS_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-LANUEJOULS_SOUND", "title": "ALLOc : Lanuéjouls : Parabole", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:32:16+02:00", "issued": "2010-10-25T18:32:16+02:00", "publishers": [ @@ -3575,7 +3575,7 @@ "id": "11280.100/crdo-12-MARNAC1LEX_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-MARNAC1LEX_SOUND", "title": "ALLOc : Marnac", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:33:17+02:00", "issued": "2010-10-25T18:33:17+02:00", "publishers": [ @@ -3684,7 +3684,7 @@ "id": "11280.100/crdo-12-MARNAC2LEX_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-MARNAC2LEX_SOUND", "title": "ALLOc : Marnac-2", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:33:43+02:00", "issued": "2010-10-25T18:33:43+02:00", "publishers": [ @@ -3793,7 +3793,7 @@ "id": "11280.100/crdo-12-MARNAC3LEX_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-MARNAC3LEX_SOUND", "title": "ALLOc : Marnac-3", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:33:51+02:00", "issued": "2010-10-25T18:33:51+02:00", "publishers": [ @@ -3902,7 +3902,7 @@ "id": "11280.100/crdo-12-MARNAC4MORPHO_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-MARNAC4MORPHO_SOUND", "title": "ALLOc : Marnac-4", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:34:19+02:00", "issued": "2010-10-25T18:34:19+02:00", "publishers": [ @@ -4011,7 +4011,7 @@ "id": "11280.100/crdo-12-MARNAC5MORPHO_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-MARNAC5MORPHO_SOUND", "title": "ALLOc : Marnac-5", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:35:45+02:00", "issued": "2010-10-25T18:35:45+02:00", "publishers": [ @@ -4120,7 +4120,7 @@ "id": "11280.100/crdo-12-MAYRAN1LEX_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-MAYRAN1LEX_SOUND", "title": "ALLOc : Mayran", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:36:22+02:00", "issued": "2010-10-25T18:36:22+02:00", "publishers": [ @@ -4249,7 +4249,7 @@ "id": "11280.100/crdo-12-MAYRAN2LEX_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-MAYRAN2LEX_SOUND", "title": "ALLOc : Mayran", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:36:52+02:00", "issued": "2010-10-25T18:36:52+02:00", "publishers": [ @@ -4378,7 +4378,7 @@ "id": "11280.100/crdo-12-MAYRAN3LEX_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-MAYRAN3LEX_SOUND", "title": "ALLOc : Mayran-3", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:36:54+02:00", "issued": "2010-10-25T18:36:54+02:00", "publishers": [ @@ -4507,7 +4507,7 @@ "id": "11280.100/crdo-12-MAYRAN4LEX_SOUND", "uri": "https://hdl.handle.net/11280.100/crdo-12-MAYRAN4LEX_SOUND", "title": "ALLOc : Mayran-4", - "language": ["http://lexvo.org/id/iso639-3/oci"], + "languages": ["http://lexvo.org/id/iso639-3/oci"], "modified": "2010-10-25T18:37:07+02:00", "issued": "2010-10-25T18:37:07+02:00", "publishers": [ diff -r 226d5b17a119 -r 13564bb13ccc cms/app-client/mirage/serializers/sparse-document.js --- a/cms/app-client/mirage/serializers/sparse-document.js Tue Oct 11 02:49:59 2016 +0200 +++ b/cms/app-client/mirage/serializers/sparse-document.js Tue Oct 11 16:39:11 2016 +0200 @@ -12,7 +12,7 @@ let json = BaseSerializer.prototype.serialize.apply(this, arguments); let page = Math.max(parseInt(request.queryParams.page || 1) - 1, 0); - let perPage = parseInt(request.queryParams.perpage || 15); + let perPage = parseInt(request.queryParams.perpage || 100); json['documents'] = _.map(_.slice(json['documents'], page*perPage, (page+1)*perPage), function(doc) { let res = _.omit(doc, ['publishers', 'mediaArray', 'transcript']); diff -r 226d5b17a119 -r 13564bb13ccc server/bo_client/app/models/document.js --- a/server/bo_client/app/models/document.js Tue Oct 11 02:49:59 2016 +0200 +++ b/server/bo_client/app/models/document.js Tue Oct 11 16:39:11 2016 +0200 @@ -9,7 +9,7 @@ title: DS.attr('string'), - language: DS.attr({defaultValue: function() { return []; }}), + languages: DS.attr({defaultValue: function() { return []; }}), publishers: DS.attr({defaultValue: function() { return []; }}), diff -r 226d5b17a119 -r 13564bb13ccc server/bo_client/app/templates/doc.hbs --- a/server/bo_client/app/templates/doc.hbs Tue Oct 11 02:49:59 2016 +0200 +++ b/server/bo_client/app/templates/doc.hbs Tue Oct 11 16:39:11 2016 +0200 @@ -22,7 +22,7 @@
{{t 'bo.document_language'}}
-
{{#each model.language as |lang index|}}{{if index ", "}}{{doc-language url=lang}}{{/each}}
+
{{#each model.languages as |lang index|}}{{if index ", "}}{{doc-language url=lang}}{{/each}}
diff -r 226d5b17a119 -r 13564bb13ccc server/src/app/Providers/PaginationServiceProvider.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/app/Providers/PaginationServiceProvider.php Tue Oct 11 16:39:11 2016 +0200 @@ -0,0 +1,32 @@ +app['request']; + $queryParams = $r->all(); + unset($queryParams[config('corpusparole.pagination_page_param')]); + + $question = $r->getBaseUrl().$r->getPathInfo() == '/' ? '/?' : '?'; + return $r->url().$question.http_build_query($queryParams); + }); + + } +}