diff --git a/Makefile b/Makefile index 52f1317967..162e266248 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ install: make install_assets install_composer: - composer install + composer install --ignore-platform-reqs install_asset_dependencies: npm install diff --git a/Vagrantfile b/Vagrantfile index 25c71c028c..0221742083 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -100,7 +100,7 @@ Vagrant.configure("2") do |config| end else config.vm.provision :shell, path: "resources/ansible/windows.sh", args: ["default"] - config.vm.provision :shell, run: "always", path: "resources/ansible/windows-always.sh", args: ["default"] + # config.vm.provision :shell, run: "always", path: "resources/ansible/windows-always.sh", args: ["default"] end config.vm.synced_folder "./", "/vagrant", type: "nfs" diff --git a/package.json b/package.json index fdbf9591b8..30249c9283 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,11 @@ "scripts": { "dev": "./node_modules/.bin/gulp sync;", "build": "./node_modules/.bin/gulp build;", - "postinstall": "./node_modules/.bin/gulp install;" + "postinstall": "./node_modules/.bin/gulp install;", + "phraseanet-production-client": "npm uninstall phraseanet-production-client && npm install phraseanet-production-client && ./node_modules/.bin/gulp build-phraseanet-production-client" }, "dependencies": { "alchemy-embed-medias": "^0.4.4", - "phraseanet-production-client": "~0.19.24" + "phraseanet-production-client": "../Phraseanet-production-client" } } diff --git a/templates/web/prod/orders/order_item.html.twig b/templates/web/prod/orders/order_item.html.twig index 1aa2eac7c0..23c2a4971c 100644 --- a/templates/web/prod/orders/order_item.html.twig +++ b/templates/web/prod/orders/order_item.html.twig @@ -109,7 +109,7 @@
-' + elem.elementPreview[0].outerHTML + ' | ';#} - {#html += '' + elem.elementTitle[0].outerHTML + ' | ';#} - {#html += '
' + elem.elementPreview[0].outerHTML + ' | ';#} - {#html += '' + elem.elementTitle[0].outerHTML + ' | ';#} - {#html += '
{{ 'order-manager::order-item: items-already-sent' | trans }}: '#} - {#+ countObj.validated + '
';#} - {#}#} - - {#if(countObj.waitingForValidation > 0) {#} - {#html += '{{ 'order-manager::order-item: items-waiting-validation' | trans }}: '#} - {#+ countObj.waitingForValidation + '
';#} - {#}#} - - {#//for the remaining items#} - {#var remaining = countObj.selectable - (countObj.validated + countObj.waitingForValidation);#} - {#if(remaining > 0) {#} - {#html += '{{ 'order-manager::order-item: for-non-sent-items' | trans }}: '#} - {#+ remaining + '
';#} - {#$('#order-action button.deny, #order-action button.send').prop('disabled', false);#} - {#$('#order-action button.deny, #order-action button.send').show();#} - {#}#} - - {#$('#wrapper-multiple #text-content').empty();#} - {#$('#wrapper-multiple #text-content').append(html);#} - {#}#} - - {#/* *#} - {#* function to update status of send and deny button#} - {#* params - array of type for each button selected#} - {#*/#} - {#function updateButtonStatus(elementArrayType) {#} - {#if(_.contains(elementArrayType, ELEMENT_TYPE.VALIDATED)) {#} - {#$('#order-action button.deny, #order-action button.send').hide();#} - {#$('#order-action span.action-text').html('{{ 'order-manager::order-item: already-validated' | trans }}' + '');#} - {#$('#order-action span.action-text').show();#} - {#}else if (_.contains(elementArrayType, ELEMENT_TYPE.WAITINGFORVALIDATION)) {#} - {#$('#order-action button.deny, #order-action span.action-text').hide();#} - {#$('#order-action button.send').show();#} - {#$('#order-action button.send').prop('disabled', true);#} - {#}else if (_.contains(elementArrayType, ELEMENT_TYPE.DENIED)) {#} - {#$('#order-action button.deny').hide();#} - {#$('#order-action span.action-text').html('{{ 'order-manager::order-item: refused-previously' | trans }}');#} - {#$('#order-action button.send').prop('disabled', false);#} - {#$('#order-action button.send, #order-action span.action-text').show();#} - {#}else {#} - {#$('#order-action button.send, #order-action button.deny').prop('disabled', false);#} - {#$('#order-action button.send, #order-action button.deny').show();#} - {#$('#order-action span.action-text').hide();#} - {#}#} - {#}#} - - - {#function loadPreviewAndCaption(elem) {#} - {#$('#preview-layout').empty();#} - {#$('#caption-layout').empty();#} - {#updateButtonStatus(elem.attr('class').split(/\s+/));#} - {#var elementids = elem.attr('elementids').split('_');#} - {#var sbasId = elementids[0];#} - {#var recordId = elementids[1];#} - {#prevAjax = $.ajax({#} - {#type: "GET",#} - {#url: "../prod/records/record/"+sbasId+'/'+recordId+'/',#} - {#dataType: 'json',#} - {#success: function (data) {#} - {#if (data.error) {#} - {#return;#} - {#}#} - {#$('#preview-layout').append(data.html_preview);#} - {#$('#caption-layout').append(data.desc);#} - {#}#} - {#});#} -// } - \ No newline at end of file