From e1266560e7fd3f366fac64a4e759b70f22aa8ab0 Mon Sep 17 00:00:00 2001
From: Sunhaolin <sunhaolin@hotoa.com>
Date: Mon, 10 Aug 2020 14:06:39 +0800
Subject: [PATCH] Merge branch '1.21' into 1.22

---
 apps/contracts/.env                                            | 3 ++-
 .../client/views/instance/instance_attachments.html            | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/contracts/.env b/apps/contracts/.env
index 51c6f26842..93aeeb53f1 100644
--- a/apps/contracts/.env
+++ b/apps/contracts/.env
@@ -1,3 +1,4 @@
 MONGO_URL=mongodb://127.0.0.1:27017/steedos
 ROOT_URL=http://127.0.0.1:5000/
-PORT=5000
\ No newline at end of file
+PORT=5000
+ENV_STORAGE_DIR=./storage
\ No newline at end of file
diff --git a/creator/packages/steedos-workflow/client/views/instance/instance_attachments.html b/creator/packages/steedos-workflow/client/views/instance/instance_attachments.html
index 7e20a64889..12d044870c 100644
--- a/creator/packages/steedos-workflow/client/views/instance/instance_attachments.html
+++ b/creator/packages/steedos-workflow/client/views/instance/instance_attachments.html
@@ -5,11 +5,13 @@
 			<div class="attachments-btns">
 				<span class="box-title" style="display: inline-block;font-weight: bold;">{{_t "instance_main_attachment"}}</span>
 
+				{{#if enabled_add_main_attachment}}
 				<div class="slds-button slds-button_neutral slds-m-left_x-small ins-upload" title='{{_ "instance_main_attachment"}}' style="{{#if enabled_add_main_attachment}}{{else}}display: none{{/if}}">
 					<input type="file" name="file" class="ins-file-input" id="ins_upload_main_attach">
 					{{> steedos_icon class="slds-button__icon" source="utility-sprite" name="upload"}}
 					<span>&nbsp;{{_ "workflow_attach_upload"}}</span>
 				</div>
+				{{/if}}
 				{{#if isNode}}
 					<div class="slds-button slds-button_neutral ins-upload" title='{{_ "instance_main_attachment"}}' style="{{#if enabled_add_main_attachment}}{{else}}display: none;{{/if}}margin-left: 0.5rem;">
 						<button type="button" class="ins-file-input" id="ins_new_main_file"></button>