Commit 974c16d3 authored by Rafael Monnerat's avatar Rafael Monnerat

Minor bug fixes for rss feeds

See merge request nexedi/slapos.core!433
parents 8086cd4a 984569a5
...@@ -36,7 +36,7 @@ for brain in portal.portal_simulation.getMovementHistoryList( ...@@ -36,7 +36,7 @@ for brain in portal.portal_simulation.getMovementHistoryList(
security_query=portal.portal_catalog.getSecurityQuery(), security_query=portal.portal_catalog.getSecurityQuery(),
# Limit only to listable portal types # Limit only to listable portal types
portal_type=['Web Message', 'Mail Nessage'], portal_type=['Web Message', 'Mail Nessage'],
follow_up_simulation_state = ['validated','submitted', 'suspended', 'invalidated', follow_up_simulation_state = ['validated','submitted', 'suspended', 'invalidated',
# Unfortunally Upgrade decision uses diferent states. # Unfortunally Upgrade decision uses diferent states.
'confirmed', 'started', 'stopped', 'delivered'], 'confirmed', 'started', 'stopped', 'delivered'],
only_accountable=False, only_accountable=False,
...@@ -48,6 +48,7 @@ for brain in portal.portal_simulation.getMovementHistoryList( ...@@ -48,6 +48,7 @@ for brain in portal.portal_simulation.getMovementHistoryList(
('uid', 'desc')), ('uid', 'desc')),
**context_kw): **context_kw):
event = brain.getObject() event = brain.getObject()
(ticket_title, (ticket_title,
ticket_category, ticket_category,
ticket_link) = getTicketInfo(event) ticket_link) = getTicketInfo(event)
...@@ -56,10 +57,10 @@ for brain in portal.portal_simulation.getMovementHistoryList( ...@@ -56,10 +57,10 @@ for brain in portal.portal_simulation.getMovementHistoryList(
Object(**{ Object(**{
'title': ticket_title, 'title': ticket_title,
'category': ticket_category, 'category': ticket_category,
'author': brain.node_title, 'author': event.getSourceTitle(checked_permission="View"),
'link': ticket_link, 'link': ticket_link,
'description': event.getTextContent(), 'description': event.getTextContent(),
'pubDate': brain.date, 'pubDate': event.getStartDate(),
'guid': '{}-{}'.format( 'guid': '{}-{}'.format(
event.getFollowUp(), event.getFollowUp(),
event.getRelativeUrl()), event.getRelativeUrl()),
......
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
</tuple> </tuple>
<tuple> <tuple>
<string>description</string> <string>description</string>
<string>summary</string> <string>description</string>
</tuple> </tuple>
<tuple> <tuple>
<string>link</string> <string>link</string>
......
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
</tuple> </tuple>
<tuple> <tuple>
<string>description</string> <string>description</string>
<string>Description</string> <string>description</string>
</tuple> </tuple>
<tuple> <tuple>
<string>link</string> <string>link</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment