@@ -75,7 +79,8 @@ export default {
name: 'ScinoteEditDownload',
props: {
data: { type: String, required: true },
- isUpdateVersionModal: { type: Boolean, required: false }
+ isUpdateVersionModal: { type: Boolean, required: false },
+ isCompact: { type: Boolean, required: false, default: false }
},
data() {
return {
@@ -91,7 +96,7 @@ export default {
return /Mac OS/.test(this.userAgent);
},
showButtonLabel() {
- return this.responseData && this.responseData.length > 0 && !this.isUpdateVersionModal;
+ return this.responseData && this.responseData.length > 0 && !this.isUpdateVersionModal && !this.isCompact;
},
getWindowsHref() {
return this.responseData && this.responseData.length > 0 ? this.responseData[0].url : '#';
diff --git a/app/views/my_modules/_task_flow_and_sharing.html.erb b/app/views/my_modules/_task_flow_and_sharing.html.erb
index a060cf190..8ebfc60ac 100644
--- a/app/views/my_modules/_task_flow_and_sharing.html.erb
+++ b/app/views/my_modules/_task_flow_and_sharing.html.erb
@@ -1,14 +1,13 @@
<%= render partial: 'my_modules/status_flow/task_flow_button', locals: { my_module: @my_module } if @my_module.my_module_status_flow %>
<%= javascript_include_tag("my_modules/status_flow") %>
- <% if current_team.shareable_links_enabled? %>
<%= javascript_include_tag 'vue_share_task_container' %>
- <% end %>
diff --git a/app/views/repository_columns/_manage_column_modal_content.html.erb b/app/views/repository_columns/_manage_column_modal_content.html.erb
index 03442d578..fba93d4c8 100644
--- a/app/views/repository_columns/_manage_column_modal_content.html.erb
+++ b/app/views/repository_columns/_manage_column_modal_content.html.erb
@@ -98,6 +98,14 @@
selected>
<%= t('libraries.manange_modal_column.select.repository_stock_value') %>
+ <% elsif !RepositoryBase.stock_management_enabled? %>
+
<% end %>
diff --git a/app/views/shared/navigation/_left.html.erb b/app/views/shared/navigation/_left.html.erb
index 6fc822b78..5c0cdd2ef 100644
--- a/app/views/shared/navigation/_left.html.erb
+++ b/app/views/shared/navigation/_left.html.erb
@@ -5,9 +5,9 @@