Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved human text.

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-18 13:35:56 +02:00
parent 5b8adc206a
commit 5a5419c2c1
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/assets/javascripts/app/controllers/_ui_element/ticket_selector.js.coffee
View file

@ -84,9 +84,10 @@ class App.UiElement.ticket_selector
) )
# build inital params # build inital params
if !_.isEmpty(params.condition) if !_.isEmpty(params[attribute.name])
selectorExists = false selectorExists = false
for groupAndAttribute, meta of params.condition for groupAndAttribute, meta of params[attribute.name]
if groupAndAttribute isnt 'attribute' if groupAndAttribute isnt 'attribute'
selectorExists = true selectorExists = true
operator = meta.operator operator = meta.operator
@ -268,18 +269,11 @@ class App.UiElement.ticket_selector
# get stored params # get stored params
if meta && objectAttribute[1] if meta && objectAttribute[1]
selectorExists = true
operator = meta.operator operator = meta.operator
value = meta.value value = meta.value
model = toCamelCase(objectAttribute[0]) model = toCamelCase(objectAttribute[0])
modelAttribute = objectAttribute[1]
config = elements[attribute] config = elements[attribute]
if modelAttribute.substr(modelAttribute.length-4,4) is '_ids'
modelAttribute = modelAttribute.substr(0, modelAttribute.length-4)
if modelAttribute.substr(modelAttribute.length-3,3) is '_id'
modelAttribute = modelAttribute.substr(0, modelAttribute.length-3)
valueHuman = [] valueHuman = []
if _.isArray(value) if _.isArray(value)
for data in value for data in value
@ -287,7 +281,10 @@ class App.UiElement.ticket_selector
valueHuman.push r valueHuman.push r
else else
valueHuman.push @humanTextLookup(config, value) valueHuman.push @humanTextLookup(config, value)
rules.push "#{App.i18n.translateContent('Where')} <b>#{App.i18n.translateContent(model)} -> #{App.i18n.translateContent(toCamelCase(modelAttribute))}</b> #{App.i18n.translateContent(operator)} <b>#{valueHuman}</b>."
if valueHuman.join
valueHuman = valueHuman.join(', ')
rules.push "#{App.i18n.translateContent('Where')} <b>#{App.i18n.translateContent(model)} -> #{App.i18n.translateContent(config.display)}</b> #{App.i18n.translateContent(operator)} <b>#{valueHuman}</b>."
return [none] if _.isEmpty(rules) return [none] if _.isEmpty(rules)
rules rules