Merge branch '1.21' into 1.22

This commit is contained in:
Sunhaolin 2020-08-10 14:06:39 +08:00
parent 3cbc2a38a2
commit e1266560e7
2 changed files with 4 additions and 1 deletions

View File

@ -1,3 +1,4 @@
MONGO_URL=mongodb://127.0.0.1:27017/steedos
ROOT_URL=http://127.0.0.1:5000/
PORT=5000
PORT=5000
ENV_STORAGE_DIR=./storage

View File

@ -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>