symposion_app Changeset - f4c4009c4db3

Changeset - f4c4009c4db3

Parent rev.

Child rev.

[Not reviewed]

Merge

0 1 0

Sheila Miguez - 10 years ago 2014-09-28 17:55:49
codersquid@users.noreply.github.com

Merge pull request #64 from codersquid/json_placeholders

adds placeholder values for future model changes to ProposalBase

1 file changed with 12 insertions and 1 deletions:

symposion/schedule/views.py

0 comments (0 inline, 0 general)

symposion/schedule/views.py

➞

Show inline comments

@@ ... / @@ -179,6 +179,17 @@ def schedule_json(request): @@
             "duration": slot.length_in_minutes,
             "kind": slot.kind.label,
             "section": slot.day.schedule.section.slug,
             "conf_key": slot.pk,
             # TODO: models should be changed.
             # these are model features from other conferences that have forked symposion
             # these have been used almost everywhere and are good candidates for
             # base proposals
             "license": "CC BY",
             "tags": "",
             "released": True,
             "contact": [],
+        }
         if hasattr(slot.content, "proposal"):
             slot_data.update({
@@ ... / @@ -189,7 +200,7 @@ def schedule_json(request): @@
                 ] if request.user.is_staff else ["redacted"],
                 "abstract": slot.content.abstract.raw,
                 "description": slot.content.description.raw,
-                "content_href": "%s://%s%s" % (
+                "conf_url": "%s://%s%s" % (
                     protocol,
                     Site.objects.get_current().domain,
                     reverse("schedule_presentation_detail", args=[slot.content.pk])

0 comments (0 inline, 0 general)