Merge branch 'hotfix/closed-stories-collection'

This commit is contained in:
Tobi Schäfer 2014-11-30 22:36:10 +01:00
commit c089075ee4

View file

@ -47,7 +47,7 @@ featured.order = created desc
closed = collection(Story) closed = collection(Story)
closed.local = id closed.local = id
closed.foreign site_id closed.foreign = site_id
closed.filter = prototype = 'Story' and status = 'closed' closed.filter = prototype = 'Story' and status = 'closed'
closed.order = created desc closed.order = created desc
@ -80,14 +80,14 @@ tags.local = id
tags.foreign = site_id tags.foreign = site_id
tags.order = name asc tags.order = name asc
tags.filter = tag.type = 'Story' tags.filter = tag.type = 'Story'
alphabeticalTags = collection(Tag) alphabeticalTags = collection(Tag)
alphabeticalTags.accessName = name alphabeticalTags.accessName = name
alphabeticalTags.local = id alphabeticalTags.local = id
alphabeticalTags.foreign = site_id alphabeticalTags.foreign = site_id
alphabeticalTags.filter = tag.type = 'Story' and \ alphabeticalTags.filter = tag.type = 'Story' and \
substr(tag.name, 1, 1) >= "A" and \ substr(tag.name, 1, 1) >= "A" and \
substr(tag.name, 1, 1) <= "Z" substr(tag.name, 1, 1) <= "Z"
alphabeticalTags.group = upper(substr(tag.name, 1, 1)) alphabeticalTags.group = upper(substr(tag.name, 1, 1))
alphabeticalTags.group.order = tag.name asc alphabeticalTags.group.order = tag.name asc
@ -97,6 +97,6 @@ otherTags.local = id
otherTags.foreign = site_id otherTags.foreign = site_id
otherTags.filter = tag.type = 'Story' and \ otherTags.filter = tag.type = 'Story' and \
substr(tag.name, 1, 1) < "A" or \ substr(tag.name, 1, 1) < "A" or \
substr(tag.name, 1, 1) > "Z" substr(tag.name, 1, 1) > "Z"
otherTags.group = tag.name otherTags.group = tag.name
otherTags.group.order = tag.name asc otherTags.group.order = tag.name asc