@@ -349,12 +362,53 @@
:type="costanti.FieldType.string"
>
-
-
+
+
+
+
+ Scegli l'Immagine:
+
+
+
+
+
+
+ {{ myproduct.productInfo.imagefile }}
+
@@ -998,7 +1065,11 @@
@click="toggleFullScreen"
>
diff --git a/src/model/Products.ts b/src/model/Products.ts
index 07a4ec79..22bd18c3 100755
--- a/src/model/Products.ts
+++ b/src/model/Products.ts
@@ -22,7 +22,7 @@ export interface IProductInfo {
stars?: number
date?: Date
icon?: string
- img?: string
+ imagefile?: string
img2?: string
img3?: string
img4?: string
diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts
index c5774878..1c17505b 100755
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -307,7 +307,7 @@ export const costanti = {
VISUTABLE_USER_TABCIRCUIT: -5,
VISUTABLE_GROUP_CIRCUIT: -6,
- DIR_UPLOAD: 'upload/', // upload/
+ DIR_UPLOAD: 'upload/',
FRIENDS: 1,
ASK_TRUST: 2,
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index efe68fec..74529c1d 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -2220,7 +2220,7 @@ export const colTableProductInfos = [
AddCol({ name: 'name', label_trans: 'products.name' }),
AddCol({ name: 'description', label_trans: 'products.description', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'icon', label_trans: 'products.icon' }),
- AddCol({ name: 'img', label_trans: 'products.img', fieldtype: costanti.FieldType.image_and_filename, path: 'upload/products/' }),
+ AddCol({ name: 'imagefile', label_trans: 'products.img', fieldtype: costanti.FieldType.image_and_filename, path: costanti.DIR_UPLOAD + 'products/' }),
AddCol({
name: 'department',
label_trans: 'products.department',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index b36f2391..98581a75 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -7340,18 +7340,25 @@ export const tools = {
// console.log('arrimage', arrimage)
if (shared_consts.TABLES_DIRECTORY_A_PARTE.includes(table)) {
- return `upload/${table}/` + groupname + '/' + arrimage[0].imagefile
+ return costanti.DIR_UPLOAD + `${table}/` + groupname + '/' + arrimage[0].imagefile
} else if (shared_consts.TABLES_DIRECTORY_SINGLE_IMG.includes(table)) {
- return `upload/${table}/` + groupname + '/' + arrimage[0].imagefile
+ return costanti.DIR_UPLOAD + `${table}/` + groupname + '/' + arrimage[0].imagefile
} else {
// console.log('username', username, 'table', table)
if (arrimage && arrimage.length > 0) {
- return `upload/profile/${username}/${table}/` + arrimage[0].imagefile
+ return costanti.DIR_UPLOAD + `profile/${username}/${table}/` + arrimage[0].imagefile
} else {
return ''
}
}
},
+ getFullFileNameByImageFile(imagefile: string, table: string) {
+ // console.log('arrimage', arrimage)
+
+ if (shared_consts.TABLES_IMAGEFILE_SINGOLO.includes(table)) {
+ return costanti.DIR_UPLOAD + `products/` + imagefile
+ }
+ },
canModifyThisRec(rec: any, tablesel: string) {
// console.log('rec', rec)
@@ -7921,7 +7928,7 @@ export const tools = {
},
getImgFileByFilename(elem: IMyElem, filename: string) {
- return 'upload/pages/' + elem.path + '/' + filename
+ return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + filename
},
getImgFileByElem(elem: IMyElem, reccard?: IMyCard) {
@@ -7938,13 +7945,13 @@ export const tools = {
addtourl = '?v=' + reccard.vers_img
}
- return 'upload/pages/' + elem.path + '/' + reccard.imagefile + addtourl
+ return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + reccard.imagefile + addtourl
} else
return ''
} else if (elem.type === shared_consts.ELEMTYPE.IMAGE) {
- return 'upload/pages/' + elem.path + '/' + elem.container + addtourl
+ return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + elem.container + addtourl
} else {
- return 'upload/pages/' + elem.path + '/' + elem.image + addtourl
+ return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + elem.image + addtourl
}
}
},
diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue
index 61c9c761..5c4e31e2 100755
--- a/src/views/admin/dbop/dbop.vue
+++ b/src/views/admin/dbop/dbop.vue
@@ -533,6 +533,11 @@
color="primary"
@click="EseguiFunz('correggiProductTypes', '', '')"
>
+
diff --git a/src/views/user/myservice/myservice.vue b/src/views/user/myservice/myservice.vue
index 5f6670cf..35b67a4f 100755
--- a/src/views/user/myservice/myservice.vue
+++ b/src/views/user/myservice/myservice.vue
@@ -17,30 +17,6 @@
diff --git a/upload_cartella_imgs_from_pcb.sh b/upload_cartella_imgs_from_pcb.sh
new file mode 100755
index 00000000..4be5b093
--- /dev/null
+++ b/upload_cartella_imgs_from_pcb.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+source ./.env.prod.pcb
+
+msg="*** Sincronizza la Cartella UPLOAD dal Server $SERVERDIR_WEBSITE in LOCALE (Y/N) ? "
+
+if [ "$1" = "" ]; then
+ read -p "$msg" risposta
+else
+ risposta=$1
+fi
+
+cp .env.production .env.prod.bak
+cp .env.prod.pcb .env.production
+
+sleep 1
+
+
+echo "Sincronizzazione $SERVERDIR_WEBSITE/upload ..."
+rsync -avz -e 'ssh -p 8822' pcbuser@pcb:$SERVERDIR_WEBSITE/upload/ upload/
+rsync -avz -e 'ssh -p 8822' pcbuser@pcb:$SERVERDIR_WEBSITE/upload/ public/upload/
+
+cp .env.prod.bak .env.production
+
+sleep 1
+
+echo "Finito $SERVERDIR_WEBSITE"