# HG changeset patch # User ymh # Date 1487782705 -3600 # Node ID b3c738a20af84b434abc550f127d48fde77f6dd6 # Parent d6adc4047ede39c42f38a46445e74489cd13776a Add transcript right declaration, resolve bug #0026452 diff -r d6adc4047ede -r b3c738a20af8 cms/app-client/app/templates/components/doc-rights.hbs --- a/cms/app-client/app/templates/components/doc-rights.hbs Wed Feb 22 14:44:28 2017 +0100 +++ b/cms/app-client/app/templates/components/doc-rights.hbs Wed Feb 22 17:58:25 2017 +0100 @@ -1,2 +1,2 @@ Licence Creative Commons
-Cette notice est mise à disposition selon les termes de la Licence Creative Commons {{ text }} {{ version }} International. +{{ object }} selon les termes de la Licence Creative Commons {{ text }} {{ version }} Internationale. diff -r d6adc4047ede -r b3c738a20af8 cms/app-client/app/templates/components/notice-component.hbs --- a/cms/app-client/app/templates/components/notice-component.hbs Wed Feb 22 14:44:28 2017 +0100 +++ b/cms/app-client/app/templates/components/notice-component.hbs Wed Feb 22 17:58:25 2017 +0100 @@ -77,6 +77,13 @@ Droits - {{ doc-rights url=item.rights }} + {{ doc-rights url=item.rights object="Cette resource est mise à disposition"}} + {{#if item.transcript }} + + Droits Transcript + {{ doc-rights url=item.transcript.rights object="Le transcript est mis à disposition"}} + + {{/if}} + \ No newline at end of file diff -r d6adc4047ede -r b3c738a20af8 cms/app-client/mirage/fixtures/documents.js --- a/cms/app-client/mirage/fixtures/documents.js Wed Feb 22 14:44:28 2017 +0100 +++ b/cms/app-client/mirage/fixtures/documents.js Wed Feb 22 17:58:25 2017 +0100 @@ -60,7 +60,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/moyse-faurie/uve/crdo-UVE_MOCIKA.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144187_MOCIKA_22km.wav": { @@ -302,7 +303,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/cfpp2000/fra/Louise_Liotard_F_85_et_Jeanne_Mallet_F_75_SO-1.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber", + "rights": "http://creativecommons.org/licenses/by-nc-sa/3.0/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/masters/344490.wav": { @@ -610,7 +612,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/ploog/fra/crdo-FRA_PK_IV_10.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/145183_IV_10_22km.wav": { @@ -911,7 +914,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/cuxac/fsl/crdo-FSL-CUC023.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/cuxac/CUC023_low.mp4": { @@ -1062,7 +1066,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/bril/nee/crdo-NEE_KHIAAK_KO_AK.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/145138_KHIAAK_KO_AK_22km.wav": { @@ -1240,7 +1245,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/eslo/ESLO1_ENT_047_C.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber", + "rights": "http://creativecommons.org/licenses/by-nc-sa/3.0/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/eslo/ESLO1_ENT_047.mp3": { @@ -1370,7 +1376,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/rombi/swb/crdo-SWB_HOMME.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144931_HOMME_22km.wav": { @@ -1554,7 +1561,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/eslo/ESLO1_ENT_101_C.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber", + "rights": "http://creativecommons.org/licenses/by-nc-sa/3.0/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/eslo/ESLO1_ENT_101.mp3": { @@ -1858,7 +1866,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/data/dalbera_stefanaggi/crdo-DAM040.pdf", "format": "application/pdf", - "conforms-to": null + "conforms-to": null, + "rights": "http://creativecommons.org/licenses/by-nc-nd/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/154961_record_22km.wav": { @@ -1974,7 +1983,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/moyse-faurie/fud/crdo-MOC_0001.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber", + "rights": "http://creativecommons.org/licenses/by-nc-nd/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144208_MOC_0001_22km.wav": { @@ -2265,7 +2275,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/eslo/ESLO1_ENT_001_C.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber", + "rights": "http://creativecommons.org/licenses/by-nc-sa/3.0/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/355009.mp3": { @@ -2521,7 +2532,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/dalbera-stefanaggi/cos/crdo-DAM011.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-nd/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/154932_record_22km.wav": { @@ -2895,7 +2907,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/moyse-faurie/ane/crdo-ANE_OISEAU.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144166_OISEAU_22km.wav": { @@ -3007,7 +3020,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/moyse-faurie/axx/crdo-AXX_PURA.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144178_PURA_22km.wav": { @@ -3118,7 +3132,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/moyse-faurie/ane/crdo-ANE_FOURMI.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144165_FOURMI_22km.wav": { @@ -3229,7 +3244,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/moyse-faurie/uve/crdo-UVE_ATUNAI.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144181_ATUNAI_22km.wav": { @@ -3341,7 +3357,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/ozanne-rivierre/uve/crdo-UVE_LOGOTI.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144272_LOGOTI_22km.wav": { @@ -3459,7 +3476,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/ozanne-rivierre/iai/crdo-IAI_CIAU.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144252_CIAU_22km.wav": { @@ -3569,7 +3587,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/ozanne-rivierre/nem/crdo-NEM_DIUUT.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144263_DIUUT_22km.wav": { @@ -3675,7 +3694,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/ozanne-rivierre/nem/crdo-NEM_ANGUI.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144257_ANGUI_22km.wav": { @@ -3780,7 +3800,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/ozanne-rivierre/nem/crdo-NEM_CORBEAU.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144262_CORBEAU_22km.wav": { @@ -3887,7 +3908,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/ozanne-rivierre/nem/crdo-NEM_POULE.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144266_POULE_22km.wav": { @@ -3992,7 +4014,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/ozanne-rivierre/nem/crdo-NEM_POU.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144267_POU_22km.wav": { @@ -4096,7 +4119,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/ozanne-rivierre/nem/crdo-NEM_RITES.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/144268_RITES_22km.wav": { @@ -5753,7 +5777,8 @@ "transcript": { "url": "http://cocoon.huma-num.fr/exist/crdo/mavrogiannis/lad/crdo-LAD_INT12_1.xml", "format": "application/xml", - "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive" + "conforms-to": "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_archive", + "rights": "http://creativecommons.org/licenses/by-nc-sa/2.5/" }, "mediaArray": { "http://cocoon.huma-num.fr/data/archi/149008_record_22km.wav": { diff -r d6adc4047ede -r b3c738a20af8 server/src/app/Models/TranscriptResource.php --- a/server/src/app/Models/TranscriptResource.php Wed Feb 22 14:44:28 2017 +0100 +++ b/server/src/app/Models/TranscriptResource.php Wed Feb 22 17:58:25 2017 +0100 @@ -13,10 +13,12 @@ class TranscriptResource extends WebResource { private $conformsTo = -1; + private $rights = false; protected function doClearMemoizationCache() { $this->conformsTo = -1; + $this->rights = false; } public function getConformsTo() { @@ -28,11 +30,20 @@ return $this->conformsTo; } + public function getRights() { + if($this->rights === false) { + $rightsRes = $this->getResource(""); + $this->rights = is_null($rightsRes)?null:$rightsRes->getUri(); + } + return $this->rights; + } + protected function jsonSerializeExtra() { return [ - 'conforms-to' => $this->getConformsTo() + 'conforms-to' => $this->getConformsTo(), + 'rights' => $this->getRights() ]; } -} \ No newline at end of file +}