diff --git a/app/assets/stylesheets/my_modules/status_flow.scss b/app/assets/stylesheets/my_modules/status_flow.scss index 26740cb5e..0d26ea384 100644 --- a/app/assets/stylesheets/my_modules/status_flow.scss +++ b/app/assets/stylesheets/my_modules/status_flow.scss @@ -21,7 +21,7 @@ &.open .dropdown-menu{ align-items: center; display: grid; - grid-template-columns: max-content min-content minmax(0, auto); + grid-template-columns: minmax(0, auto) 12px minmax(0, auto); padding: .5em 0; li { @@ -36,6 +36,14 @@ &:hover > *{ background: $color-concrete; } + + &.disabled { + pointer-events: none; + + .status-name { + background: $color-alto !important; + } + } } .fa-long-arrow-alt-right { @@ -64,7 +72,8 @@ @include font-small; color: $color-silver-chalice; grid-column: span 3; - padding: .5em 1em; + line-height: 1em; + padding: 0em 1em .5em; } #viewTaskFlow { diff --git a/app/models/my_module_status.rb b/app/models/my_module_status.rb index c35506760..4cc745fee 100644 --- a/app/models/my_module_status.rb +++ b/app/models/my_module_status.rb @@ -48,6 +48,8 @@ class MyModuleStatus < ApplicationRecord end def conditions_fulfilled?(my_module) + my_module.errors.clear + my_module_status_conditions.each do |condition| condition.call(my_module) end diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb index 4be942264..2eb509377 100644 --- a/app/views/my_modules/status_flow/_task_flow_button.html.erb +++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb @@ -13,32 +13,36 @@