From d2bdd2ed4aaefc3b4f155537fc917ac4a362f023 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Fri, 11 Jan 2019 14:45:33 +0400 Subject: [PATCH 01/11] port 4.1: migrate field type text to string --- lib/Alchemy/Phrasea/Core/Version.php | 2 +- .../SearchEngine/Elastic/Structure/Field.php | 1 - lib/classes/databox.php | 1 - lib/classes/databox/field.php | 1 - lib/classes/patch/410alpha14a.php | 64 +++++++++++++++++++ lib/conf.d/bases_structure.xml | 2 +- lib/conf.d/data_templates/DublinCore.xml | 2 +- lib/conf.d/data_templates/en-simple.xml | 2 +- lib/conf.d/data_templates/fr-simple.xml | 2 +- .../web/admin/fields/templates.html.twig | 1 - .../Phrasea/Controller/Api/ApiJsonTest.php | 2 +- 11 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 lib/classes/patch/410alpha14a.php diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 860c3b2679..b2bf620798 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -16,7 +16,7 @@ class Version /** * @var string */ - private $number = '4.1.0-alpha.13b'; + private $number = '4.1.0-alpha.14a'; /** * @var string diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/Field.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/Field.php index 7ea7d68d43..3b71f6f451 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/Field.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/Field.php @@ -89,7 +89,6 @@ class Field implements Typed case databox_field::TYPE_NUMBER: return FieldMapping::TYPE_DOUBLE; case databox_field::TYPE_STRING: - case databox_field::TYPE_TEXT: return FieldMapping::TYPE_STRING; } diff --git a/lib/classes/databox.php b/lib/classes/databox.php index 76f98524cf..c02ef4ffba 100644 --- a/lib/classes/databox.php +++ b/lib/classes/databox.php @@ -446,7 +446,6 @@ class databox extends base implements ThumbnailedElement databox_field::TYPE_DATE , databox_field::TYPE_NUMBER , databox_field::TYPE_STRING - , databox_field::TYPE_TEXT ] ) ? $type : databox_field::TYPE_STRING; diff --git a/lib/classes/databox/field.php b/lib/classes/databox/field.php index cd12bc8682..35fc525265 100644 --- a/lib/classes/databox/field.php +++ b/lib/classes/databox/field.php @@ -100,7 +100,6 @@ class databox_field implements cache_cacheableInterface protected $original_dces; protected $aggregable; - const TYPE_TEXT = "text"; const TYPE_DATE = "date"; const TYPE_STRING = "string"; const TYPE_NUMBER = "number"; diff --git a/lib/classes/patch/410alpha14a.php b/lib/classes/patch/410alpha14a.php new file mode 100644 index 0000000000..719b1a9700 --- /dev/null +++ b/lib/classes/patch/410alpha14a.php @@ -0,0 +1,64 @@ +release; + } + + /** + * {@inheritdoc} + */ + public function getDoctrineMigrations() + { + return []; + } + + /** + * {@inheritdoc} + */ + public function require_all_upgrades() + { + return false; + } + + /** + * {@inheritdoc} + */ + public function concern() + { + return $this->concern; + } + + /** + * {@inheritdoc} + */ + public function apply(base $databox, Application $app) + { + $sql = "UPDATE metadatas_structure SET type = 'string' where type = 'text' OR type = '' "; + $databox->get_connection()->executeQuery($sql); + + return true; + } +} diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml index 13ed58fcb9..a4d0d2f9c5 100644 --- a/lib/conf.d/bases_structure.xml +++ b/lib/conf.d/bases_structure.xml @@ -1901,7 +1901,7 @@ type - enum('string','text','date','number') + enum('string','date','number') diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml index 5de4f32945..aada9b2258 100644 --- a/lib/conf.d/data_templates/DublinCore.xml +++ b/lib/conf.d/data_templates/DublinCore.xml @@ -198,7 +198,7 @@ - + diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index a9b2e33460..e42b18a490 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -202,7 +202,7 @@ - + diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml index 550b8adac8..6af9a072f3 100644 --- a/lib/conf.d/data_templates/fr-simple.xml +++ b/lib/conf.d/data_templates/fr-simple.xml @@ -202,7 +202,7 @@ - + diff --git a/templates/web/admin/fields/templates.html.twig b/templates/web/admin/fields/templates.html.twig index 7a566a2df4..c785a9a701 100644 --- a/templates/web/admin/fields/templates.html.twig +++ b/templates/web/admin/fields/templates.html.twig @@ -130,7 +130,6 @@ diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php index 49c1677fd8..d78194c4d7 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php @@ -742,7 +742,7 @@ class ApiJsonTest extends ApiTestCase } $this->assertTrue(is_string($metadatas['thesaurus_branch'])); - $this->assertTrue(in_array($metadatas['type'], [\databox_field::TYPE_DATE, \databox_field::TYPE_STRING, \databox_field::TYPE_NUMBER, \databox_field::TYPE_TEXT])); + $this->assertTrue(in_array($metadatas['type'], [\databox_field::TYPE_DATE, \databox_field::TYPE_STRING, \databox_field::TYPE_NUMBER])); $this->assertTrue(is_bool($metadatas['indexable'])); $this->assertTrue(is_bool($metadatas['multivalue'])); $this->assertTrue(is_bool($metadatas['readonly'])); From 3466d4f8619e07e0b537165040e2f0659bb5f72d Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Fri, 11 Jan 2019 16:04:23 +0100 Subject: [PATCH 02/11] PHRAS-2368 Add python dependencies to server packages to fix elasticsearch setup --- resources/ansible/roles/server/tasks/main.yml | 4 ++++ resources/ansible/vars/all.yml | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/resources/ansible/roles/server/tasks/main.yml b/resources/ansible/roles/server/tasks/main.yml index d1aac1d10f..531e6fa74d 100644 --- a/resources/ansible/roles/server/tasks/main.yml +++ b/resources/ansible/roles/server/tasks/main.yml @@ -18,6 +18,10 @@ with_items: '{{ server.packages }}' when: server.packages is defined +- name: Pip install ndg-httpsclient + shell: pip install ndg-httpsclient + sudo: yes + - name: Configure the timezone sudo: yes template: src=timezone.j2 dest=/etc/timezone diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml index d90cfd8640..e1282c99b5 100644 --- a/resources/ansible/vars/all.yml +++ b/resources/ansible/vars/all.yml @@ -21,6 +21,13 @@ server: - xpdf - libav-tools - gpac + - python + - python-urllib3 + - python3-openssl + - python-pyasn1 + - python-pyasn1-modules + - python3-pyasn1 + - python-pip timezone: UTC locales: - en_GB.UTF-8 From dc1c5c2750cd71a5ca6adbbd7496363b75e1e93f Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Mon, 14 Jan 2019 12:48:39 +0100 Subject: [PATCH 03/11] PHRAS-2368 Change cmd elasticsearch create index Cmd bin/console s:c:p is deprecated --- resources/ansible/roles/app/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ansible/roles/app/tasks/main.yml b/resources/ansible/roles/app/tasks/main.yml index 66de8ad0ea..623d28d124 100644 --- a/resources/ansible/roles/app/tasks/main.yml +++ b/resources/ansible/roles/app/tasks/main.yml @@ -60,7 +60,7 @@ chdir: /vagrant/ - name: Create ElasticSearch indexes - shell: php bin/console s:i:c + shell: php bin/console searchengine:index -c args: chdir: /vagrant/ From f249d530b32c7ca9a11735de4e5bd7839fb5d2c3 Mon Sep 17 00:00:00 2001 From: Filip Vilic Date: Mon, 14 Jan 2019 15:21:12 +0100 Subject: [PATCH 04/11] PHRAS-2385_port_local_manu_refacto --- resources/www/common/images/icons/Share.png | Bin 0 -> 1432 bytes resources/www/common/images/icons/archive.png | Bin 0 -> 1147 bytes .../www/common/images/icons/basket-1.png | Bin 0 -> 5379 bytes resources/www/common/images/icons/detach.png | Bin 0 -> 1138 bytes .../common/images/icons/disktt_history.png | Bin 2513 -> 5755 bytes .../www/common/images/icons/edit-pen.png | Bin 0 -> 5122 bytes .../www/common/images/icons/export-shadow.png | Bin 0 -> 4951 bytes .../www/common/images/icons/print-shadow.png | Bin 0 -> 5068 bytes .../www/common/images/icons/print_history.png | Bin 2105 -> 4004 bytes resources/www/common/images/icons/rename.png | Bin 0 -> 791 bytes .../www/common/images/icons/set-order.png | Bin 0 -> 892 bytes .../www/lightbox/images/lightbox-icon.png | Bin 0 -> 276 bytes templates/web/prod/WorkZone/Macros.html.twig | 73 ++++++++++++------ templates/web/prod/results/record.html.twig | 22 ++++-- 14 files changed, 67 insertions(+), 28 deletions(-) create mode 100644 resources/www/common/images/icons/Share.png create mode 100644 resources/www/common/images/icons/archive.png create mode 100644 resources/www/common/images/icons/basket-1.png create mode 100644 resources/www/common/images/icons/detach.png create mode 100644 resources/www/common/images/icons/edit-pen.png create mode 100644 resources/www/common/images/icons/export-shadow.png create mode 100644 resources/www/common/images/icons/print-shadow.png create mode 100644 resources/www/common/images/icons/rename.png create mode 100644 resources/www/common/images/icons/set-order.png create mode 100644 resources/www/lightbox/images/lightbox-icon.png diff --git a/resources/www/common/images/icons/Share.png b/resources/www/common/images/icons/Share.png new file mode 100644 index 0000000000000000000000000000000000000000..447ced8ba7235fdc34c53ebd4ab12f9e39558534 GIT binary patch literal 1432 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 N002ovPDHLkV1lAyDz5+l literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/basket-1.png b/resources/www/common/images/icons/basket-1.png new file mode 100644 index 0000000000000000000000000000000000000000..fa623948424a78dac5ffa1095a9d86f2836f59ca GIT binary patch literal 5379 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 literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/detach.png b/resources/www/common/images/icons/detach.png new file mode 100644 index 0000000000000000000000000000000000000000..0f9080d04f03dab8a9c582ee037f4da53bde2a63 GIT binary patch literal 1138 zcmV-&1daQNP)Px(EJ;K`R7ee_mQQG$RS>}E+i$a*bQ4NbO#IWDiXbI~N)d_&!JAaDpoiKXv?-<9 zq7q5kASrkd!JsLLw$?+7(nJJf5Jf$BR1^_Ggi^d!tp~-ZMct%LvPstY&3^N;`|Y+H zabVueoA+ks&3iNReUVfklh86Wv#)==3@G2}E6E0lBIUqM3H`?fP>ImZW@A}iUJ=uU zu@xO!6$^^1rlVVb(aFt<0j4L1+E8PIExdbvP{0HVS(v58`7^nE;pzPcCwu{FW?}qD z@BopN5oXnA2}w&!ETvNAWa=}Ba=oM>_9Nn z?|%ic$c@nfvv#LHU7nSf$3JvA)D9FY)2G(U^?Na=&y>iHH1p4Ch`(+U}@w+ zr)eb`Te9C$j;Ejmcra+)@l^(JrE`iLsl-w7Mj8PNij5RG6&;X$)(JgVb#4mPb7a-v zAwjK^v1kd9>~dw7IZc+E5)1?8AfYCJcjE{ME%WGsv6rGKK91o3Lb<$h^1Z3y6KaQR zw1@NigYqc(^*X!%zFzCNsiIR8YmnHYV6kn!7(7aZYxS;^>jAZQ@2!yuXthD+Y zIL0Qn&5tLzJN1ao7mfItBfI79zHK&Vn44da_N2SJ&>i!Mcwux#yhxJu>Yy5?q}!2V z@tTai`jIsN7p9%LoF;MX#H94~Znf{a%hS{&Ov}TZYUJCM&t>I}i6_Fh%Qq15(Pz(w zQvdwR?|rEut+~R6J5;!>r%TSBJ}RGl`mOXodAcs*-tAkir&=d(8X+3|iu50OJtz|~ ziF0gVk7P2DT)22StTkiO4k^~(6uX-#`c*gChb?aewv}`RLYDsZ$EC^cTer8xajqwd zBK|J_Gw84G?9$@g)YqTA`FOE-g?`CLz>41;L3vLirf&FIgb($j{CdFK84VXFONw-F zcUaR))6Q$^N0rtK?$q0v&yC`w8k)_k_uh!dcr}FizXiBEPDHI|M*si-07*qoM6N<$ Ef^nWQHvj+t literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/disktt_history.png b/resources/www/common/images/icons/disktt_history.png index 849c5acdc2e4c9578ad40f719d68af55d28690ba..e81e9e383aea1840ae2a3e46393bc079952f2519 100644 GIT binary patch literal 5755 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 literal 2513 zcmV;?2`=`DP)6Y%#%W&F3 z?39cEC5CQuNlw-Y;GkDxUxK|ROPAe+y$O3`w#mpE0SLU717DG2tKGC;9C&>e zXWNZc)DM>k&jfH&Zy13YcVZE1y-LFq0SKPzyAit&@}q^R{E&pEoDz^nvz|3;a7+LP zA8-)HM!V54TI-Yq;t+h*7y%D_i~&C8;ah+N-Unl=g}Eg(d$s^>_Kjl@Jn%6$atxj& zFjmYytsFcNfXp?HaquPy9E)=wz~lTDxV+j!c6mY)0bDbu$EfZzImODv@MtH2hRYDV zaEc9SEr1s`JK^$fb#eifXaV*4GRjA1&4nw*P0Yom>un{#XTK(22$9gV01$Spt5-UW8C@f$} zzI(1I6Mfm11jDR(A>g{=5_o#<9pEdR;OO_qE}VlmT6Skm64(B70@fejpA7;U1pyDb zIdj?UYRBMz$uL-I*0l+KD7)qLX}W{|@Mi_Io9OVOE~p@tNz`|8n)6 zFvC}x@pqpe-3Q;dowEI|8Uf!obFQQ7q-uSG1F+%HPq07upXZ!_T0m_sH2ck;&9>l+ zwE|ds)1qMkmnHFRRUPbX{R1|gJmlpPwUmIW;SS`3=ADjaf%=YB^Xu5avzpq?xB*~r z5H_Ct9W<4=Ikk%Zx^g7EIMsSCz%wU%{w%z(XB!;7*x~lnN^PWS{^!u_a{>OlBfr8k zKW_t7Q2+)8pr{}Ol|H}YwE}IV@_HxUJ>1s=p-2z=JhjM|mas^40A3Glg$-wp15wbB z6`Is2aH=y56EqFVCl)yxTh0lfPVe@L*|uQ!|9cva1l!?6S12i*rHeFY!yWL_jwT3% z&g0Be@CwW52*E9WJ`oB+v0ez{3-r+^;DIZzwag?1zUjzb&!KBKI=bigd=KXb`q_+A z@G1gVC;>kzz`7QxwmaocA2s{L;Ul;WeX6+ZhEu);}E zm^CP%A?W_0A!zIFf{IDL(IMb^Ojl`ZzZ8bX;|Dxl<7}t{9{PGCv=8)Izze+#@G1vQ zzc-|yFpKEM$Z)==2g)W)7cu}Auz&C z-Y|V81qnPz;B{j7hHzg5Eo;c~He+t-U1|BPg~`xUFDw)pDel;?wB>lJSLnSvjRfmKuMes zg?}eH4UvL4DuQS<3KYA@5Vqzk0o0_Y`^zlHsEOM-JJT3LOx>_#=Nz0$8;l%k(Q`;!p&VJs_E=VD)6{J zUeh6p;FoZM&D`*8zojHVvVyQv5^kP44W<-NvPi%f z6quek)#3#MDHSui$mgZx#z=YNdbcDuHhPzx9U($i?C(2uRb7>oXC&qCMnqWY#xdQ3 zB+M-H}R7Bi{zPUNs_?6-_pwc4~vm4k<+Jv}DheyJOd2ZQmMB*vhH z$%|PQdeG?UfcL6*&Pxk81n-Ifi3nOV ztZ{QrXKyc@K}pE+;H5pmu{hv#Z+BlgnNKr{-im^K5i z<UQ56{-9E6VE9%*eaxtMXHcO+;xepvHS-LeD28Gklkouw90 z4-Ouvi?^^O*_35WdFaDiu?fP`qVg!czi-})MY?*4wmq%Fx!az2k$ z+_xx;CN%jk?DF}%BEW`_T8O_w@0X=Ah$KYNIa0v!#Y$~2f)66#gBnqOY*@VXhg^>D be*p#nMo_o3rIN-+00000NkvXXu0mjfL+zl^ diff --git a/resources/www/common/images/icons/edit-pen.png b/resources/www/common/images/icons/edit-pen.png new file mode 100644 index 0000000000000000000000000000000000000000..efba208714c304a439e58172b3e1bccff2855bb2 GIT binary patch literal 5122 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 literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/export-shadow.png b/resources/www/common/images/icons/export-shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..90ba5c1b5340481ecb0d6d03e7654b6e4610a50b GIT binary patch literal 4951 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 V6q)dvc-{a2002ovPDHLkV1hXZa+d%A literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/set-order.png b/resources/www/common/images/icons/set-order.png new file mode 100644 index 0000000000000000000000000000000000000000..e49be67dc8ac2ce0d3d294951a4278819bd4cbd8 GIT binary patch literal 892 zcmV-?1B3jDP)Px&Hc3Q5R7ef2mOD>WQ4q(^F1rgG)I`@rs4Q%V-vB}gdL2w4~4wrL-kk z6AHcnC69v8K||=Y)F@V~xDVLH|8Kl=bNBAuU0##So!6O}GiT207%#wGTwHuwSXg-J+K5_McnhB}vhhol1?4rfU5ptH22J%K=Mi-2>TCG^_ zDiZC=%1W1!lcB8j*BQXk|r~rsx^F1@hC=)1!hf;wMd$@yX?KAGF~&GIjj) zN^<&(lUL#t|E;YpNKmI&3`@Wwlxo0|)(tE+D2{@M7Mw*+P~ z6BZX2)A~3ghJGg*rlzLC=H_PFdGM&Qx>ziR!^6YtJN9@)3if*=pf*PAfoApBRU&9s zdFmQuWD;zQhB@-EMeFS}X$2RKA&2(cK5yC|AwzynGs(sn0S#f6BfDw~SqHU@-a{OG zcCn?wOM==<#sYVCJ{cfs!#)fM3|NAQngTuJ!Q@`HAEwnX9j_{GogJTy8vJ zym4(30r8a9YPG6{psc<;74qa>8#F*a+wJz}pT)8*=S%i=8 zkNB&AKW99+B;k)Fm3hLhw=|ucqjsIxD}yJsisa?8Q357mn4DZYh$nawV)-A5A^D+h S5u;-O0000 literal 0 HcmV?d00001 diff --git a/resources/www/lightbox/images/lightbox-icon.png b/resources/www/lightbox/images/lightbox-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ef9f72ec70855edbbcc7aba6866ebb20b768161e GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}T7XZ8tE{Xv5J^i*N=Zoo88R|b z5N=p#Xj*EDva%vj1Spl0o!!*fsH&=*nUPUfTdSxjFD@=BDJd=?DVCj;)z;dUmX?~F zoRpHBoSv2%5*(bHlbfFhM0rJpg|RU)af|l*0BvL|3GxfR^Y-oAPj8no$h!kY!aZFa zLnJPrJ%60BK|z4wpmmEgtFanS#(!TfiL8S8pQ9OEQaJZ97AVb3+quY^&tpmVrb+w> zExUf|ZkcPi_g{j<@|(9(Lr*!+xn1`BPNCP+=ZE$s7z%#VKWW3EAM{%E9?%K~Pgg&e IbxsLQ0Ahw&CjbBd literal 0 HcmV?d00001 diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index 04f3d3d735..d496cb2e7c 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -136,55 +136,72 @@ -
+
{{ 'action::exporter' | trans }} + data-kind="basket" data-id="{{basket.getId()}}"> + + {{ 'action::exporter' | trans }} + {{ 'action::exporter' | trans }} +
- Lightbox + + {{ 'Lightbox' | trans }} + {{ 'Lightbox' | trans }} +
- {{ 'action::renommer' | trans }} + {{ 'action::renommer' | trans }} + {{ 'action::renommer' | trans }}
{% if basket.getValidation() %}
- -
- {{ 'action::Valider' | trans }} -
- +
+ + {{ 'action::Valider' | trans }} + {{ 'action::Valider' | trans }} + +
{% endif %}
- {{ 'Archive' | trans }} -
-
-
-
- {{ 'action : supprimer' | trans }} + + {{ 'Archive' | trans }} + {{ 'Archive' | trans }} +
- {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }}
+
+
+ +
@@ -222,24 +239,33 @@ -
+
{{ 'action::exporter' | trans }} + data-kind="record" data-id="{{story.getRecord(app).get_serialize_key()}}"> + + {{ 'action::exporter' | trans }} + {{ 'action::exporter' | trans }} +
- {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %}
{{ 'action::editer' | trans }} + > + + {{ 'action::editer' | trans }} + {{ 'action::editer' | trans }} +
- {% endif %} + {% endif %}
- {{ 'action::detacher' | trans }} + {{ 'action::detacher' | trans }} + {{ 'action::detacher' | trans }}
@@ -249,7 +275,8 @@ data-db-id="{{ story.getRecord(app).get_sbas_id }}" data-record-id="{{ story.getRecord(app).get_record_id() }}" href="#"> - {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }}
diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig index 413cd04769..2d537dd72c 100644 --- a/templates/web/prod/results/record.html.twig +++ b/templates/web/prod/results/record.html.twig @@ -111,25 +111,34 @@ -
+
{% if granted_on_collection(record.baseId, [constant('\\ACL::CANPUTINALBUM')]) and not record.story %}
- {{ 'action : ajouter au panier' | trans }} + + {{ 'action : ajouter au panier' | trans }} + {{ 'action : ajouter au panier' | trans }} +
{% endif %} {% if granted_on_collection(record.baseId, [constant('\\ACL::CANDWNLDPREVIEW')]) or granted_on_collection(record.baseId, [constant('\\ACL::CANDWNLDHD')]) %}
- {{ 'action : exporter' | trans }} + + {{ 'action : exporter' | trans }} + {{ 'action : exporter' | trans }} +
{% endif %}
- {{ 'action : print' | trans }} + + {{ 'action : print' | trans }} + {{ 'action : print' | trans }} +
{% if app['conf'].get(['registry', 'actions', 'social-tools']) == 'all' @@ -138,7 +147,10 @@ {% if record.story is empty %}
{% endif %} From 26a25532f57d44f3740d77ac321a4c8d205015c6 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Tue, 15 Jan 2019 15:54:37 +0400 Subject: [PATCH 05/11] taken account config to retrieve token in header or in url --- lib/classes/API/OAuth2/Adapter.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/classes/API/OAuth2/Adapter.php b/lib/classes/API/OAuth2/Adapter.php index c674aa277b..e64e258b1d 100644 --- a/lib/classes/API/OAuth2/Adapter.php +++ b/lib/classes/API/OAuth2/Adapter.php @@ -537,7 +537,9 @@ class API_OAuth2_Adapter extends OAuth2 public function verifyAccessToken($scope = null, $exit_not_present = true, $exit_invalid = true, $exit_expired = true, $exit_scope = true, $realm = null) { - $token_param = $this->getAccessTokenParams(); + $useTokenHeader = $this->app['conf']->get(['main', 'api_token_header']); + + $token_param = $this->getAccessTokenParams($useTokenHeader); // Access token was not provided if ($token_param === false) { From fd495e7966a2d30e0e858687716729ce3f521375 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Tue, 15 Jan 2019 17:06:34 +0400 Subject: [PATCH 06/11] update configuration.sample.yml for api_token_header config --- config/configuration.sample.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/configuration.sample.yml b/config/configuration.sample.yml index 5ae54d2134..050b6562c1 100644 --- a/config/configuration.sample.yml +++ b/config/configuration.sample.yml @@ -7,6 +7,7 @@ main: languages: [] key: '' api_require_ssl: true + api_token_header: false database: host: 127.0.0.1 port: 3306 From cb490bc83d0466a97d67c99ab31e54888aa1a4c8 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Wed, 16 Jan 2019 12:27:24 +0400 Subject: [PATCH 07/11] use const on call --- lib/classes/API/OAuth2/Adapter.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/classes/API/OAuth2/Adapter.php b/lib/classes/API/OAuth2/Adapter.php index e64e258b1d..4de6639d4d 100644 --- a/lib/classes/API/OAuth2/Adapter.php +++ b/lib/classes/API/OAuth2/Adapter.php @@ -537,7 +537,9 @@ class API_OAuth2_Adapter extends OAuth2 public function verifyAccessToken($scope = null, $exit_not_present = true, $exit_invalid = true, $exit_expired = true, $exit_scope = true, $realm = null) { - $useTokenHeader = $this->app['conf']->get(['main', 'api_token_header']); + $apiTokenHeader = $this->app['conf']->get(['main', 'api_token_header']); + + $useTokenHeader = $this->useTokenHeaderChoice($apiTokenHeader); $token_param = $this->getAccessTokenParams($useTokenHeader); @@ -810,4 +812,21 @@ class API_OAuth2_Adapter extends OAuth2 return false; } } + + /** + * Get the correct constante to call on Oauth2 + * + * @param $apiTokenHeader + * @return string + */ + private function useTokenHeaderChoice($apiTokenHeader) + { + if ($apiTokenHeader === true) { + return Oauth2::TOKEN_ONLY_IN_HEADER; + } elseif ($apiTokenHeader === false) { + return Oauth2::TOKEN_ONLY_IN_GETPOST; + } else { + return Oauth2::TOKEN_AUTO_FIND; + } + } } From 1e851113c8fac2cede66b59519ec55d975edd106 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Thu, 17 Jan 2019 11:02:22 +0400 Subject: [PATCH 08/11] update alchemy/oauth2php in 4.1 --- composer.json | 2 +- composer.lock | 43 +++++++++++++++++-------------------------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index bd39a204e7..98a77a6f1a 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "alchemy/embed-bundle": "^0.3.4", "alchemy/geonames-api-consumer": "~0.1.0", "alchemy/mediavorus": "^0.4.4", - "alchemy/oauth2php": "1.0.0", + "alchemy/oauth2php": "1.1.0", "alchemy/phlickr": "0.2.9", "alchemy/phpexiftool": "^0.7.0", "alchemy/rest-bundle": "^0.0.5", diff --git a/composer.lock b/composer.lock index 9745425f25..727a76d576 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "253990d4c81f9ae5f78c6c1221d6cf29", + "content-hash": "adf4074eb26ea80d414430d4f7b61311", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -337,16 +337,16 @@ }, { "name": "alchemy/oauth2php", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/alchemy-fr/oauth2-php.git", - "reference": "cb4fcb73e30ab54e0fb85a65b4d57147f7a0df15" + "reference": "fe5c19b417965110bad0981a6dfd2097b5ce4306" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/oauth2-php/zipball/cb4fcb73e30ab54e0fb85a65b4d57147f7a0df15", - "reference": "cb4fcb73e30ab54e0fb85a65b4d57147f7a0df15", + "url": "https://api.github.com/repos/alchemy-fr/oauth2-php/zipball/fe5c19b417965110bad0981a6dfd2097b5ce4306", + "reference": "fe5c19b417965110bad0981a6dfd2097b5ce4306", "shasum": "" }, "type": "library", @@ -356,7 +356,7 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "time": "2013-07-01T09:46:59+00:00" + "time": "2019-01-16T16:10:46+00:00" }, { "name": "alchemy/phlickr", @@ -1898,12 +1898,12 @@ "version": "v2.5.6", "source": { "type": "git", - "url": "https://github.com/doctrine/doctrine2.git", + "url": "https://github.com/doctrine/orm.git", "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b", + "url": "https://api.github.com/repos/doctrine/orm/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b", "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b", "shasum": "" }, @@ -2304,12 +2304,12 @@ "version": "v2.2.1", "source": { "type": "git", - "url": "https://github.com/google/google-api-php-client.git", + "url": "https://github.com/googleapis/google-api-php-client.git", "reference": "b69b8ac4bf6501793c389d4e013a79d09c85c5f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-api-php-client/zipball/b69b8ac4bf6501793c389d4e013a79d09c85c5f2", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/b69b8ac4bf6501793c389d4e013a79d09c85c5f2", "reference": "b69b8ac4bf6501793c389d4e013a79d09c85c5f2", "shasum": "" }, @@ -2363,12 +2363,12 @@ "version": "v0.36", "source": { "type": "git", - "url": "https://github.com/google/google-api-php-client-services.git", + "url": "https://github.com/googleapis/google-api-php-client-services.git", "reference": "2fd7d2876fbc0174faddba3241956a1393536159" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/2fd7d2876fbc0174faddba3241956a1393536159", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/2fd7d2876fbc0174faddba3241956a1393536159", "reference": "2fd7d2876fbc0174faddba3241956a1393536159", "shasum": "" }, @@ -2400,12 +2400,12 @@ "version": "v1.1.0", "source": { "type": "git", - "url": "https://github.com/google/google-auth-library-php.git", + "url": "https://github.com/googleapis/google-auth-library-php.git", "reference": "548d27d670f0236dc5258fa4cdde6e7b63464cfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/548d27d670f0236dc5258fa4cdde6e7b63464cfd", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/548d27d670f0236dc5258fa4cdde6e7b63464cfd", "reference": "548d27d670f0236dc5258fa4cdde6e7b63464cfd", "shasum": "" }, @@ -5766,17 +5766,6 @@ { "name": "roave/security-advisories", "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "3db4b0df21d1f527304650e717c66af48981f1c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/3db4b0df21d1f527304650e717c66af48981f1c4", - "reference": "3db4b0df21d1f527304650e717c66af48981f1c4", - "shasum": "" - }, "conflict": { "adodb/adodb-php": "<5.20.6", "amphp/artax": ">=2,<2.0.4|>0.7.1,<1.0.4", @@ -6015,6 +6004,7 @@ "keywords": [ "microframework" ], + "abandoned": "symfony/flex", "time": "2016-01-06T14:59:35+00:00" }, { @@ -6060,6 +6050,7 @@ ], "description": "A WebProfiler for Silex", "homepage": "http://silex.sensiolabs.org/", + "abandoned": true, "time": "2016-01-10T11:39:13+00:00" }, { From 9976ebee6f8dfd304bd39738a8807a94bc0a7934 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Thu, 17 Jan 2019 19:02:00 +0400 Subject: [PATCH 09/11] update composer.lock --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 727a76d576..9d00d30e67 100644 --- a/composer.lock +++ b/composer.lock @@ -341,12 +341,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/oauth2-php.git", - "reference": "fe5c19b417965110bad0981a6dfd2097b5ce4306" + "reference": "801510972240555fa182813851efd96659d37a68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/oauth2-php/zipball/fe5c19b417965110bad0981a6dfd2097b5ce4306", - "reference": "fe5c19b417965110bad0981a6dfd2097b5ce4306", + "url": "https://api.github.com/repos/alchemy-fr/oauth2-php/zipball/801510972240555fa182813851efd96659d37a68", + "reference": "801510972240555fa182813851efd96659d37a68", "shasum": "" }, "type": "library", @@ -356,7 +356,7 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "time": "2019-01-16T16:10:46+00:00" + "time": "2019-01-17T14:34:10+00:00" }, { "name": "alchemy/phlickr", From 8799bfb99ae2fcd6ec4a8299b8b2cd59aacdc7a3 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Tue, 22 Jan 2019 16:36:48 +0400 Subject: [PATCH 10/11] update alchemy/mediavorus --- composer.lock | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/composer.lock b/composer.lock index 9745425f25..fafac96e4e 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], "content-hash": "253990d4c81f9ae5f78c6c1221d6cf29", @@ -275,16 +275,16 @@ }, { "name": "alchemy/mediavorus", - "version": "0.4.8", + "version": "0.4.9", "source": { "type": "git", "url": "https://github.com/alchemy-fr/MediaVorus.git", - "reference": "6a50c397211dfdf6da108ea1ebc7527c37419ab7" + "reference": "1a96dc4142ff8474c11285cab9eab11df9683255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/MediaVorus/zipball/6a50c397211dfdf6da108ea1ebc7527c37419ab7", - "reference": "6a50c397211dfdf6da108ea1ebc7527c37419ab7", + "url": "https://api.github.com/repos/alchemy-fr/MediaVorus/zipball/1a96dc4142ff8474c11285cab9eab11df9683255", + "reference": "1a96dc4142ff8474c11285cab9eab11df9683255", "shasum": "" }, "require": { @@ -333,7 +333,7 @@ "keywords": [ "metadata" ], - "time": "2018-05-03T14:17:10+00:00" + "time": "2019-01-22T11:23:34+00:00" }, { "name": "alchemy/oauth2php", @@ -1898,12 +1898,12 @@ "version": "v2.5.6", "source": { "type": "git", - "url": "https://github.com/doctrine/doctrine2.git", + "url": "https://github.com/doctrine/orm.git", "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b", + "url": "https://api.github.com/repos/doctrine/orm/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b", "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b", "shasum": "" }, @@ -2304,12 +2304,12 @@ "version": "v2.2.1", "source": { "type": "git", - "url": "https://github.com/google/google-api-php-client.git", + "url": "https://github.com/googleapis/google-api-php-client.git", "reference": "b69b8ac4bf6501793c389d4e013a79d09c85c5f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-api-php-client/zipball/b69b8ac4bf6501793c389d4e013a79d09c85c5f2", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/b69b8ac4bf6501793c389d4e013a79d09c85c5f2", "reference": "b69b8ac4bf6501793c389d4e013a79d09c85c5f2", "shasum": "" }, @@ -2363,12 +2363,12 @@ "version": "v0.36", "source": { "type": "git", - "url": "https://github.com/google/google-api-php-client-services.git", + "url": "https://github.com/googleapis/google-api-php-client-services.git", "reference": "2fd7d2876fbc0174faddba3241956a1393536159" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/2fd7d2876fbc0174faddba3241956a1393536159", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/2fd7d2876fbc0174faddba3241956a1393536159", "reference": "2fd7d2876fbc0174faddba3241956a1393536159", "shasum": "" }, @@ -2400,12 +2400,12 @@ "version": "v1.1.0", "source": { "type": "git", - "url": "https://github.com/google/google-auth-library-php.git", + "url": "https://github.com/googleapis/google-auth-library-php.git", "reference": "548d27d670f0236dc5258fa4cdde6e7b63464cfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/548d27d670f0236dc5258fa4cdde6e7b63464cfd", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/548d27d670f0236dc5258fa4cdde6e7b63464cfd", "reference": "548d27d670f0236dc5258fa4cdde6e7b63464cfd", "shasum": "" }, @@ -5766,17 +5766,6 @@ { "name": "roave/security-advisories", "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "3db4b0df21d1f527304650e717c66af48981f1c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/3db4b0df21d1f527304650e717c66af48981f1c4", - "reference": "3db4b0df21d1f527304650e717c66af48981f1c4", - "shasum": "" - }, "conflict": { "adodb/adodb-php": "<5.20.6", "amphp/artax": ">=2,<2.0.4|>0.7.1,<1.0.4", @@ -6015,6 +6004,7 @@ "keywords": [ "microframework" ], + "abandoned": "symfony/flex", "time": "2016-01-06T14:59:35+00:00" }, { @@ -6060,6 +6050,7 @@ ], "description": "A WebProfiler for Silex", "homepage": "http://silex.sensiolabs.org/", + "abandoned": true, "time": "2016-01-10T11:39:13+00:00" }, { From 9e7e9fe284a7bea7bdf74ccf339a735b104bb0ef Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Fri, 25 Jan 2019 10:58:20 +0100 Subject: [PATCH 11/11] PHRAS-2410 disable pear.php.net in master --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ab1d246b2..76f7c42a12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,8 @@ jobs: - run: git clone https://github.com/alanxz/rabbitmq-c - run: cd rabbitmq-c && git checkout 2ca1774489328cde71195f5fa95e17cf3a80cb8a - run: cd rabbitmq-c && git submodule init && git submodule update && autoreconf -i && ./configure && make && sudo make install - - run: pecl channel-update pear.php.net + # disabled because pear.php.net is down cause of security failure + #- run: pecl channel-update pear.php.net - run: yes '' | pecl install amqp-1.9.3 - run: yes '' | pecl install imagick - run: sudo apt-get install libzmq-dev