diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/form_handler_core_workflow.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/form_handler_core_workflow.coffee index 4fb18c9db..699740da8 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/form_handler_core_workflow.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/form_handler_core_workflow.coffee @@ -32,6 +32,12 @@ class App.FormHandlerCoreWorkflow result.push(screen) return result + # returns if the object and screen is controlled by core workflow + @checkScreen: (checkObject, checkScreen) -> + for object, screens of coreWorkflowScreens + return true if checkObject is object && _.contains(screens, checkScreen) + return false + # returns active Core Workflow requests. it is used to stabilize tests @getRequests: -> return coreWorkflowRequests diff --git a/app/assets/javascripts/app/models/_application_model.coffee b/app/assets/javascripts/app/models/_application_model.coffee index 501630619..e5ff9764b 100644 --- a/app/assets/javascripts/app/models/_application_model.coffee +++ b/app/assets/javascripts/app/models/_application_model.coffee @@ -224,7 +224,7 @@ set new attributes of model (remove already available attributes) attributesNew = {} if screen for attribute in attributes - if attribute && attribute.screen && attribute.screen[screen] && (!_.isEmpty(attribute.screen[screen]) && (attribute.screen[screen].shown is true || attribute.screen[screen].shown is undefined)) + if attribute && attribute.screen && attribute.screen[screen] && (!_.isEmpty(attribute.screen[screen]) && (attribute.screen[screen].shown is true || attribute.screen[screen].shown is undefined || App.FormHandlerCoreWorkflow.checkScreen(@.className, screen))) for item, value of attribute.screen[screen] attribute[item] = value attributesNew[ attribute.name ] = attribute diff --git a/app/assets/javascripts/app/views/generic/attribute.jst.eco b/app/assets/javascripts/app/views/generic/attribute.jst.eco index 11288904f..90f051e2c 100644 --- a/app/assets/javascripts/app/views/generic/attribute.jst.eco +++ b/app/assets/javascripts/app/views/generic/attribute.jst.eco @@ -1,4 +1,4 @@ -