diff options
| author | Silvio <silvio@socioambiental.org> | 2013-06-25 15:44:26 -0300 |
|---|---|---|
| committer | Silvio <silvio@socioambiental.org> | 2013-06-25 15:44:26 -0300 |
| commit | 4076881c589a77002133e59777e97d7a62d8f7af (patch) | |
| tree | dad881a67716f773bcc18ab1fe4a40fa73a7bdc8 | |
| parent | ee4874a1847e98590d24ce01b43f6ae518864986 (diff) | |
| download | timelinejs-4076881c589a77002133e59777e97d7a62d8f7af.tar.gz timelinejs-4076881c589a77002133e59777e97d7a62d8f7af.tar.bz2 | |
Tag with a text field
| -rw-r--r-- | timelinejs.module | 4 | ||||
| -rw-r--r-- | timelinejs_json_event.tpl.php | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/timelinejs.module b/timelinejs.module index 1bf5644..9fd4791 100644 --- a/timelinejs.module +++ b/timelinejs.module @@ -104,9 +104,7 @@ function timelinejs_fetch_items($nid, $format = 'json') { $nodes = timelinejs_load_events($nid); foreach ($nodes as $node) { - $content = node_load($node->entity_id); - $content->tag = taxonomy_term_load($content->field_categoria['und'][0]['tid']); - $items[] = $content; + $items[] = node_load($node->entity_id); } if (empty($items)) { diff --git a/timelinejs_json_event.tpl.php b/timelinejs_json_event.tpl.php index 60b88c2..75ab055 100644 --- a/timelinejs_json_event.tpl.php +++ b/timelinejs_json_event.tpl.php @@ -2,8 +2,8 @@ "startDate":"<?php print strftime('%Y,%m,%d', strtotime($event->field_date['und'][0]['value'])); ?>", "headline":"<?php print $event->title; ?>", "text":"<?php print timelinejs_strip($event->body['und'][0]['value']); ?>", -<?php if (isset($event->tag) && $event->tag != FALSE) { ?> - "tag":"<?php print $event->tag->name; ?>", +<?php if (isset($event->field_tag) && isset($event->field_tag['und'][0]['value'])) { ?> + "tag":"<?php print $event->field_tag['und'][0]['value']; ?>", <?php } ?> "asset": { |