From a2bce7125928b75da01b5bf7bc434a04911c0de8 Mon Sep 17 00:00:00 2001 From: Harrys Date: Wed, 6 Feb 2019 11:53:09 +0400 Subject: [PATCH 1/7] PHRAS-2419_refacto_Icons_actions_under_Thumbnail --- templates/web/prod/results/record.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig index 2d537dd72c..410e4d1620 100644 --- a/templates/web/prod/results/record.html.twig +++ b/templates/web/prod/results/record.html.twig @@ -53,10 +53,10 @@ {% endif %} -
+
-
+ {% set collectionLogo = collection_logo(record.baseId) %} {% if collectionLogo is empty %} {{ record.collectionName }} @@ -74,7 +74,7 @@ {% endif %} {# drop down options #} - + {% if settings.rollover_thumbnail == 'caption' %} {% if record_subdef_url(record, 'preview') is not null and has_access_subdef(record, 'preview') %} From 3db65cc514cad7ae79faf073414ba1da84a78bf4 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Tue, 21 May 2019 14:59:40 +0200 Subject: [PATCH 2/7] Dublincore Databox template update. PHRAS-2534 #comment Set type for all fields of this databox template #time 30m --- lib/conf.d/data_templates/DublinCore.xml | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml index e50bf58612..31e874a13d 100644 --- a/lib/conf.d/data_templates/DublinCore.xml +++ b/lib/conf.d/data_templates/DublinCore.xml @@ -182,26 +182,26 @@ - - <Creator src="XMP-dc:Creator" report="1" /> - <Subject src="XMP-dc:Subject" multi="1"/> - <Description src="XMP-dc:Description" report="0" /> + <Title src="XMP-dc:Title" type="string" thumbtitle="1" report="1" /> + <Creator src="XMP-dc:Creator" type="string" report="1" /> + <Subject src="XMP-dc:Subject" type="string" multi="1"/> + <Description src="XMP-dc:Description" type="string" report="0" /> <Publisher src="XMP-dc:Publisher" type="date" report="0" /> - <Contributor src="XMP-dc:Contributor" report="0"/> + <Contributor src="XMP-dc:Contributor" type="string" report="0"/> <Date src="XMP-dc:Date" type="date" report="0" /> - <Type src="XMP-dc:Type" report="1" /> - <Format src="XMP-dc:Format" report="0" /> - <Identifier src="XMP-dc:Identifier" report="1" /> - <Source src="XMP-dc:Source" report="0" /> - <Language src="XMP-dc:Language" report="0" /> - <Relation src="XMP-dc:Relation" report="0" /> - <Coverage src="XMP-dc:Coverage" report="1" /> - <Rights src="XMP-dc:Rights" report="0" /> - <Comments src="" business="1" report="0" /> + <Type src="XMP-dc:Type" type="string" report="1" /> + <Format src="XMP-dc:Format" type="string" report="0" /> + <Identifier src="XMP-dc:Identifier" type="string" report="1" /> + <Source src="XMP-dc:Source" type="string" report="0" /> + <Language src="XMP-dc:Language" type="string" report="0" /> + <Relation src="XMP-dc:Relation" type="string" report="0" /> + <Coverage src="XMP-dc:Coverage" type="string" report="1" /> + <Rights src="XMP-dc:Rights" type="string" report="0" /> + <Comments src="" business="1" type="string" report="0" /> <Filename src="Phraseanet:tf-basename" readonly="1" type="string" report="1"/> - <CameraDevice src="IFD0:Model" readonly="1" report="0" /> - <Latitude src="GPS:GPSLatitude" readonly="1" report="0" /> - <Longitude src="GPS:GPSLongitude" readonly="1" report="0"/> + <CameraDevice src="IFD0:Model" type="string" readonly="1" report="0" /> + <Latitude src="GPS:GPSLatitude" type="number" readonly="1" report="0" /> + <Longitude src="GPS:GPSLongitude" type="number" readonly="1" report="0"/> <ArchiveDate src="Phraseanet:tf-archivedate" readonly="1" type="date" report="0" /> <LastEditDate src="Phraseanet:tf-editdate" readonly="1" type="date" report="0" /> </description> From bf6da6f4385b828efb4ee04dd1dc947162149953 Mon Sep 17 00:00:00 2001 From: Alexandre BRACH <alexandre.brach@gmail.com> Date: Thu, 23 May 2019 12:16:24 +0200 Subject: [PATCH 3/7] fpm service doesn't use root account anymore --- Dockerfile | 11 +++++++---- docker/phraseanet/boot.sh | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100755 docker/phraseanet/boot.sh diff --git a/Dockerfile b/Dockerfile index 8455c0e70a..c967fb593c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM php:7.1-fpm-stretch as builder - RUN apt-get update \ && apt-get install -y \ apt-transport-https \ @@ -135,8 +134,13 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /var/log/supervisor +RUN mkdir /entrypoint /var/alchemy \ + && useradd -u 1000 app \ + && mkdir -p /home/app/.composer \ + && chown -R app: /home/app /var/alchemy -COPY --from=builder /var/alchemy /var/alchemy/Phraseanet +COPY --from=builder --chown=app /var/alchemy /var/alchemy/Phraseanet +ADD ./docker/phraseanet/ / RUN mkdir -p /var/alchemy/Phraseanet/logs \ && chmod -R 777 /var/alchemy/Phraseanet/logs \ && mkdir -p /var/alchemy/Phraseanet/cache \ @@ -150,11 +154,10 @@ RUN mkdir -p /var/alchemy/Phraseanet/logs \ && mkdir -p /var/alchemy/Phraseanet/config \ && chmod -R 777 /var/alchemy/Phraseanet/config WORKDIR /var/alchemy/Phraseanet -CMD ["php-fpm"] +CMD ["/boot.sh"] # phraseanet-nginx FROM nginx:1.15 as phraseanet-nginx RUN useradd -u 1000 app ADD ./docker/nginx/ / COPY --from=builder /var/alchemy/www /var/alchemy/Phraseanet/www - diff --git a/docker/phraseanet/boot.sh b/docker/phraseanet/boot.sh new file mode 100755 index 0000000000..80804ce3a9 --- /dev/null +++ b/docker/phraseanet/boot.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +php-fpm From 256637024da71d9e60cc53b5bb29468a126f0f54 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat <maillat@alchemy.fr> Date: Thu, 23 May 2019 16:03:08 +0200 Subject: [PATCH 4/7] Update config.yml --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5921af091..582319826d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,8 @@ jobs: - run: node -v - run: npm -v - run: npm install -g yarn - - run: /opt/circleci/nodejs/v10.12.0/bin/yarn install + - run: ln -s /opt/circleci/nodejs/v10.12.0/bin/yarn /usr/local/bin/yarn + - run: yarn install - run: if [[ ! -e elasticsearch-2.3.3 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.3.tar.gz && tar -xvf elasticsearch-2.3.3.tar.gz && elasticsearch-2.3.3/bin/plugin install analysis-icu; fi - run: command: elasticsearch-2.3.3/bin/elasticsearch From 4f359035ef384e121de82ad31e0bf65185062771 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat <maillat@alchemy.fr> Date: Thu, 23 May 2019 16:19:41 +0200 Subject: [PATCH 5/7] PHRAS-2561 #comment rm yarn link before --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 582319826d..7ce9464ae5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,8 @@ jobs: - run: node -v - run: npm -v - run: npm install -g yarn - - run: ln -s /opt/circleci/nodejs/v10.12.0/bin/yarn /usr/local/bin/yarn + - run: rm ~/.yarn/bin/yarn + - run: ln -s /opt/circleci/nodejs/v10.12.0/bin/yarn ~/.yarn/bin/yarn - run: yarn install - run: if [[ ! -e elasticsearch-2.3.3 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.3.tar.gz && tar -xvf elasticsearch-2.3.3.tar.gz && elasticsearch-2.3.3/bin/plugin install analysis-icu; fi - run: From b4634a8bf73ba15f60535dd382f86e9445ea6ebe Mon Sep 17 00:00:00 2001 From: nmaillat <maillat@alchemy.fr> Date: Thu, 23 May 2019 22:07:56 +0200 Subject: [PATCH 6/7] PHRAS-2598 #comment add type string to fields, change to number lat and long for iptc's model #time 1h --- lib/conf.d/data_templates/en-simple.xml | 40 +++++++++++------------ lib/conf.d/data_templates/fr-simple.xml | 42 ++++++++++++------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index d4a00c347b..5c5b10910d 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -182,27 +182,27 @@ </subdefs> <description> - <Object src="IPTC:ObjectName" /> - <Category src="IPTC:Category"/> - <SupplCategory src="IPTC:SupplementalCategories" multi="1"/> - <Keywords src="IPTC:Keywords" multi="1"/> - <SpecialInstruct src="IPTC:SpecialInstructions"/> + <Object src="IPTC:ObjectName" type="string"/> + <Category src="IPTC:Category" type="string"/> + <SupplCategory src="IPTC:SupplementalCategories" type="string" multi="1"/> + <Keywords src="IPTC:Keywords" type="string" multi="1"/> + <SpecialInstruct src="IPTC:SpecialInstructions" type="string"/> <Date src="IPTC:DateCreated" type="date" /> - <Byline src="IPTC:By-line"/> - <BylineTitle src="IPTC:By-lineTitle"/> - <City src="IPTC:City" /> - <Province src="IPTC:Province-State" /> - <Country src="IPTC:Country-PrimaryLocationName" /> - <OriginalRef src="IPTC:OriginalTransmissionReference" /> - <Headline src="IPTC:Headline" report="1" thumbtitle="1" /> - <Credit src="IPTC:Credit" report="1" /> - <Source src="IPTC:Source" /> - <Caption src="IPTC:Caption-Abstract" /> - <CaptionWriter src="IPTC:Writer-Editor" /> - <Longitude src="GPS:GPSLongitude" readonly="1"/> - <Latitude src="GPS:GPSLatitude" readonly="1"/> - <CameraModel src="IFD0:Model" readonly="1"/> - <FileName src="Phraseanet:tf-basename" readonly="1" type="string" /> + <Byline src="IPTC:By-line" type="string"/> + <BylineTitle src="IPTC:By-lineTitle" type="string"/> + <City src="IPTC:City" type="string"/> + <Province src="IPTC:Province-State" type="string"/> + <Country src="IPTC:Country-PrimaryLocationName" type="string"/> + <OriginalRef src="IPTC:OriginalTransmissionReference" type="string"/> + <Headline src="IPTC:Headline" type="string" report="1" thumbtitle="1"/> + <Credit src="IPTC:Credit" type="string" report="1"/> + <Source src="IPTC:Source" type="string"/> + <Caption src="IPTC:Caption-Abstract" type="string"/> + <CaptionWriter src="IPTC:Writer-Editor" type="string"/> + <Longitude src="GPS:GPSLongitude" type="number" readonly="1"/> + <Latitude src="GPS:GPSLatitude" type="number" readonly="1"/> + <CameraModel src="IFD0:Model" type="string" readonly="1"/> + <FileName src="Phraseanet:tf-basename" type="string" readonly="1"/> </description> <statbits> diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml index 3ada8adaa6..49ab36b98d 100644 --- a/lib/conf.d/data_templates/fr-simple.xml +++ b/lib/conf.d/data_templates/fr-simple.xml @@ -182,27 +182,27 @@ </subdefs> <description> - <Objet src="IPTC:ObjectName" /> - <Categorie src="IPTC:Category"/> - <AutresCategories src="IPTC:SupplementalCategories" multi="1"/> - <MotsCles src="IPTC:Keywords" multi="1"/> - <Observations src="IPTC:SpecialInstructions"/> - <Date src="IPTC:DateCreated" type="date" /> - <Signature src="IPTC:By-line"/> - <TitreCredits src="IPTC:By-lineTitle"/> - <Ville src="IPTC:City" /> - <Province src="IPTC:Province-State" /> - <Pays src="IPTC:Country-PrimaryLocationName" /> - <ReferencesOriginales src="IPTC:OriginalTransmissionReference" /> - <Titre src="IPTC:Headline" report="1" thumbtitle="1" /> - <Credit src="IPTC:Credit" report="1" /> - <Source src="IPTC:Source" /> - <Legende src="IPTC:Caption-Abstract" /> - <Redacteur src="IPTC:Writer-Editor" /> - <Longitude src="GPS:GPSLongitude" readonly="1"/> - <Latitude src="GPS:GPSLatitude" readonly="1"/> - <AppareilPhoto src="IFD0:Model" readonly="1"/> - <NomDeFichier src="Phraseanet:tf-basename" readonly="1" type="string" /> + <Objet src="IPTC:ObjectName" type="string"/> + <Categorie src="IPTC:Category" type="string"/> + <AutresCategories src="IPTC:SupplementalCategories" type="string" multi="1"/> + <MotsCles src="IPTC:Keywords" type="string" multi="1"/> + <Observations src="IPTC:SpecialInstructions" type="string"/> + <Date src="IPTC:DateCreated" type="date"/> + <Signature src="IPTC:By-line" type="string"/> + <TitreCredits src="IPTC:By-lineTitle" type="string"/> + <Ville src="IPTC:City" type="string" /> + <Province src="IPTC:Province-State" type="string"/> + <Pays src="IPTC:Country-PrimaryLocationName" type="string"/> + <ReferencesOriginales src="IPTC:OriginalTransmissionReference" type="string"/> + <Titre src="IPTC:Headline" type="string" report="1" thumbtitle="1" /> + <Credit src="IPTC:Credit" type="string" report="1" /> + <Source src="IPTC:Source" type="string"/> + <Legende src="IPTC:Caption-Abstract" type="string"/> + <Redacteur src="IPTC:Writer-Editor" type="string"/> + <Longitude src="GPS:GPSLongitude" type="number" readonly="1"/> + <Latitude src="GPS:GPSLatitude" type="number" readonly="1"/> + <AppareilPhoto src="IFD0:Model" type="string" readonly="1"/> + <NomDeFichier src="Phraseanet:tf-basename" type="string" readonly="1"/> </description> <statbits> From a38a702ff4945a539b9f0d507d3ec689e183ee9e Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana <hra@esokia.com> Date: Fri, 24 May 2019 11:18:55 +0400 Subject: [PATCH 7/7] PHRAS-2592 #comment update composer.json for embed-bundle #time 1h --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index ad1d0d3489..bc207d2612 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "php": ">=5.5.9", "ext-intl": "*", "alchemy-fr/tcpdf-clone": "~6.0", - "alchemy/embed-bundle": "^2.0.2", + "alchemy/embed-bundle": "^2.0.3", "alchemy/geonames-api-consumer": "~0.1.0", "alchemy/mediavorus": "^0.4.4", "alchemy/oauth2php": "1.1.0", diff --git a/composer.lock b/composer.lock index 37acc17bdb..614855691c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f7b0fedd863f0f1aa5841665b563305d", + "content-hash": "de1d9335418b121d0ede26765b0a9e7d", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -131,16 +131,16 @@ }, { "name": "alchemy/embed-bundle", - "version": "2.0.1", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/alchemy-fr/embed-bundle.git", - "reference": "36c788a38bfed3ed19fdc4e1cc0290f0a674e4b9" + "reference": "e02e25a04911210eaedff0adb9cf7589010c473b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/36c788a38bfed3ed19fdc4e1cc0290f0a674e4b9", - "reference": "36c788a38bfed3ed19fdc4e1cc0290f0a674e4b9", + "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/e02e25a04911210eaedff0adb9cf7589010c473b", + "reference": "e02e25a04911210eaedff0adb9cf7589010c473b", "shasum": "" }, "require-dev": { @@ -178,10 +178,10 @@ ], "description": "Embed resources bundle", "support": { - "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.1", + "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.3", "issues": "https://github.com/alchemy-fr/embed-bundle/issues" }, - "time": "2019-05-14T12:25:18+00:00" + "time": "2019-05-23T15:23:14+00:00" }, { "name": "alchemy/geonames-api-consumer",