diff --git a/api-wiaas/.gitignore b/api-wiaas/.gitignore index d7c2a17..cb20b52 100644 --- a/api-wiaas/.gitignore +++ b/api-wiaas/.gitignore @@ -1,4 +1,3 @@ node_modules/ -client/uploads api-wiaas/client/js/bower_components vendor diff --git a/api-wiaas/client/uploads/OrderAgreement/.gitignore b/api-wiaas/client/uploads/OrderAgreement/.gitignore new file mode 100644 index 0000000..0d133b2 --- /dev/null +++ b/api-wiaas/client/uploads/OrderAgreement/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/api-wiaas/client/uploads/Statements/.gitignore b/api-wiaas/client/uploads/Statements/.gitignore new file mode 100644 index 0000000..0d133b2 --- /dev/null +++ b/api-wiaas/client/uploads/Statements/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/api-wiaas/client/uploads/TemplateAgreement/.gitignore b/api-wiaas/client/uploads/TemplateAgreement/.gitignore new file mode 100644 index 0000000..0d133b2 --- /dev/null +++ b/api-wiaas/client/uploads/TemplateAgreement/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/api-wiaas/client/uploads/configuration/.gitignore b/api-wiaas/client/uploads/configuration/.gitignore new file mode 100644 index 0000000..0d133b2 --- /dev/null +++ b/api-wiaas/client/uploads/configuration/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/api-wiaas/client/uploads/customerAcceptance/.gitignore b/api-wiaas/client/uploads/customerAcceptance/.gitignore new file mode 100644 index 0000000..0d133b2 --- /dev/null +++ b/api-wiaas/client/uploads/customerAcceptance/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/api-wiaas/client/uploads/installGuide/.gitignore b/api-wiaas/client/uploads/installGuide/.gitignore new file mode 100644 index 0000000..0d133b2 --- /dev/null +++ b/api-wiaas/client/uploads/installGuide/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/api-wiaas/client/uploads/installationProtocol/.gitignore b/api-wiaas/client/uploads/installationProtocol/.gitignore new file mode 100644 index 0000000..0d133b2 --- /dev/null +++ b/api-wiaas/client/uploads/installationProtocol/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/api-wiaas/client/uploads/orderQuestionaire/.gitignore b/api-wiaas/client/uploads/orderQuestionaire/.gitignore new file mode 100644 index 0000000..0d133b2 --- /dev/null +++ b/api-wiaas/client/uploads/orderQuestionaire/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/api-wiaas/client/uploads/templateQuestionaire/.gitignore b/api-wiaas/client/uploads/templateQuestionaire/.gitignore new file mode 100644 index 0000000..0d133b2 --- /dev/null +++ b/api-wiaas/client/uploads/templateQuestionaire/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/api-wiaas/server/components/v1/documents/templates/DocumentsAddTemplate.php b/api-wiaas/server/components/v1/documents/templates/DocumentsAddTemplate.php index ef4fb8c..da602ce 100644 --- a/api-wiaas/server/components/v1/documents/templates/DocumentsAddTemplate.php +++ b/api-wiaas/server/components/v1/documents/templates/DocumentsAddTemplate.php @@ -36,7 +36,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file)" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.zip'" ngf-max-size="20MB" class="drop-box">{{'documents.headers.SELECT_DOCUMENT' | translate}} diff --git a/api-wiaas/server/components/v1/orders/templates/AddDocumentsToOrderLayer.html b/api-wiaas/server/components/v1/orders/templates/AddDocumentsToOrderLayer.html index 5d775b6..197fbb3 100644 --- a/api-wiaas/server/components/v1/orders/templates/AddDocumentsToOrderLayer.html +++ b/api-wiaas/server/components/v1/orders/templates/AddDocumentsToOrderLayer.html @@ -38,7 +38,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file)" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'" ngf-max-size="20MB" class="drop-box">{{'orders.headers.SELECT_DOCUMENT' | translate}} diff --git a/api-wiaas/server/components/v1/orders/templates/InstallationSchedulerBrokerTemplate.php b/api-wiaas/server/components/v1/orders/templates/InstallationSchedulerBrokerTemplate.php index c49f491..a8edc47 100644 --- a/api-wiaas/server/components/v1/orders/templates/InstallationSchedulerBrokerTemplate.php +++ b/api-wiaas/server/components/v1/orders/templates/InstallationSchedulerBrokerTemplate.php @@ -52,7 +52,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file)" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'" ngf-max-size="20MB" class="drop-box">{{'orders.headers.SELECT_INSTALL_DOCUMENT' | translate}} diff --git a/api-wiaas/server/components/v1/orders/templates/InstallationSchedulerSupplierTemplate.php b/api-wiaas/server/components/v1/orders/templates/InstallationSchedulerSupplierTemplate.php index 6c775aa..61937bf 100644 --- a/api-wiaas/server/components/v1/orders/templates/InstallationSchedulerSupplierTemplate.php +++ b/api-wiaas/server/components/v1/orders/templates/InstallationSchedulerSupplierTemplate.php @@ -21,7 +21,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file)" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'" ngf-max-size="20MB" class="drop-box">{{'orders.headers.SELECT_INSTALL_DOCUMENT' | translate}} diff --git a/api-wiaas/server/components/v1/orders/templates/extra-actions/customerAcceptanceCustomerTemplate.php b/api-wiaas/server/components/v1/orders/templates/extra-actions/customerAcceptanceCustomerTemplate.php index 758c6bc..790f091 100644 --- a/api-wiaas/server/components/v1/orders/templates/extra-actions/customerAcceptanceCustomerTemplate.php +++ b/api-wiaas/server/components/v1/orders/templates/extra-actions/customerAcceptanceCustomerTemplate.php @@ -21,7 +21,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file)" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.jpg,.png,.jpeg'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.jpg,.png,.jpeg,.zip'" ngf-max-size="20MB" class="drop-box">{{'orders.headers.SELECT_ACCEPT_DOCUMENT' | translate}} diff --git a/api-wiaas/server/components/v1/orders/templates/extra-actions/procurementBrokerTemplate.php b/api-wiaas/server/components/v1/orders/templates/extra-actions/procurementBrokerTemplate.php index 4dd30f9..3c4910b 100644 --- a/api-wiaas/server/components/v1/orders/templates/extra-actions/procurementBrokerTemplate.php +++ b/api-wiaas/server/components/v1/orders/templates/extra-actions/procurementBrokerTemplate.php @@ -15,7 +15,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file, supplier.idSupplier)" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.zip'" ngf-max-size="20MB" class="drop-box">{{'orders.headers.SELECT_CONFIG_DOCUMENT' | translate}} diff --git a/api-wiaas/server/components/v1/orders/templates/extra-actions/validateQuestionnaireCustomerTemplate.php b/api-wiaas/server/components/v1/orders/templates/extra-actions/validateQuestionnaireCustomerTemplate.php index 31bf25f..73e8ca3 100644 --- a/api-wiaas/server/components/v1/orders/templates/extra-actions/validateQuestionnaireCustomerTemplate.php +++ b/api-wiaas/server/components/v1/orders/templates/extra-actions/validateQuestionnaireCustomerTemplate.php @@ -41,7 +41,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file, document.idDocument)" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.zip'" ngf-max-size="20MB" class="drop-box">{{'orders.headers.SELECT_QUESTIONAIRE' | translate}} diff --git a/api-wiaas/server/components/v1/shop/templates/ShopCartTemplate.php b/api-wiaas/server/components/v1/shop/templates/ShopCartTemplate.php index aa48e31..ab24379 100644 --- a/api-wiaas/server/components/v1/shop/templates/ShopCartTemplate.php +++ b/api-wiaas/server/components/v1/shop/templates/ShopCartTemplate.php @@ -73,7 +73,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file, document.idPackage, 'questionnaire')" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.zip'" ngf-max-size="20MB" class="drop-box">{{'shop.labels.SELECT_QUESTIONAIRE' | translate}} @@ -113,7 +113,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file, document.idPackage, 'agreement')" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'" ngf-max-size="20MB" class="drop-box">{{'shop.labels.SELECT_AGREEMENT' | translate}} diff --git a/api-wiaas/server/components/v1/suppliers/templates/UploadProductDocumentTempalte.php b/api-wiaas/server/components/v1/suppliers/templates/UploadProductDocumentTempalte.php index 343223e..f687eda 100644 --- a/api-wiaas/server/components/v1/suppliers/templates/UploadProductDocumentTempalte.php +++ b/api-wiaas/server/components/v1/suppliers/templates/UploadProductDocumentTempalte.php @@ -40,7 +40,7 @@ ng-model="files" ngf-drag-over-class="'dragover'" ngf-select="uploadFile($file)" - ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'" + ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'" ngf-max-size="20MB" class="drop-box">Select Document diff --git a/php.dockerfile b/php.dockerfile index e318185..ceb1467 100644 --- a/php.dockerfile +++ b/php.dockerfile @@ -61,4 +61,6 @@ RUN cp -r build/* /var/www/html/ COPY docker/php/.htaccess /var/www/html/ +RUN chown -R www-data:www-data /var/www/html + CMD /init-scripts/startup.sh \ No newline at end of file