Changeset 46

Timestamp:

05/24/08 11:30:09

Author:

nperriault

Message:

As of now, trunk is broken. Use branches to get stable versions.

• Preparing upgrade symfonians to use symfony 1.1
  
• Added local events alpha feature
  

Files:

• trunk/apps/main/config/routing.yml (modified) (1 diff)
• trunk/apps/main/modules/localEvents (added)
• trunk/apps/main/modules/localEvents/actions (added)
• trunk/apps/main/modules/localEvents/actions/actions.class.php (added)
• trunk/apps/main/modules/localEvents/config (added)
• trunk/apps/main/modules/localEvents/lib (added)
• trunk/apps/main/modules/localEvents/templates (added)
• trunk/apps/main/modules/localEvents/templates/homeSuccess.php (added)
• trunk/apps/main/modules/localEvents/validate (added)
• trunk/config/schema.yml (modified) (2 diffs)
• trunk/data (modified) (1 prop)
• trunk/data/fixtures/data.yml (modified) (1 diff)
• trunk/lib (modified) (1 prop)
• trunk/lib/helper/ObjectUrlHelper.php (modified) (1 diff)
• trunk/lib/model/LocalEvent.php (added)
• trunk/lib/model/LocalEventPeer.php (added)
• trunk/plugins (modified) (1 prop)
• trunk/plugins/sfGuardPlugin (deleted)
• trunk/test/functional/main/localEventsActionsTest.php (added)
• trunk/web (modified) (1 prop)

trunk/apps/main/config/routing.yml

@@ -62 +62 @@
-  url:   /:from/connection/delete/:to/:id
-  param: { module: utils, action: deleteConnection }
+
+# Local events
+local_event_delete:
+  url:   /local/:id/delete
+  param: { module: localEvents, action: delete }
+
+local_event_details:
+  url:   /local/event/:year/:month/:day/:slug
+  param: { module: localEvents, action: details }
+
+local_events_home:
+  url:   /local/*
+  param: { module: localEvents, action: home }
-
-# Events

trunk/config/schema.yml

@@ -105 +105 @@
-    _attributes:      { phpName: Event }
-    id:
-
-
-
-
-
-
-
-
-
+  
+  
+  
+  
+  
+  
+  
+  
+  
-    _indexes:
-
+  
-  
-  jobs:
@@ -146 +146 @@
-    _indexes:
-      filter_index:   [recommender_id, recommended_id, created_at]
+
+  local_event:
+    _attributes:      { phpName: LocalEvent }
+    id:
+    owner_id:         { type: integer, foreignTable: sf_guard_user, foreignReference: id, required: true, onDelete: setnull }
+    title:            { type: varchar, size: 255, required: true, index: true }
+    slug:             { type: varchar, size: 255, required: true, index: true }
+    description:      { type: longvarchar, required: true }
+    city:             { type: varchar, size: 255, required: true, index: true }
+    country:          { type: varchar, size: 2, required: true, index: true }
+    start_at:         { type: timestamp, required: true, index: true }
+    end_at:           { type: timestamp, index: true }
+    created_at:
+    updated_at:

trunk/data/fixtures/data.yml

@@ -553 +553 @@
-      project
-    created_at:       "2007-11-01 00:00:00"
+
+LocalEvent:
+  ev1:
+    owner_id:         niko
+    title:            First event
+    description: >
+      blah blah blah
+    city:             Paris
+    country:          FR
+    start_at:         "2008-12-12 00:00:00"
+  ev2:
+    owner_id:         fabpot
+    title:            Second event
+    description: >
+      blah blah blah
+    city:             Paris
+    country:          FR
+    start_at:         "2009-01-01 00:00:00"

trunk/lib/helper/ObjectUrlHelper.php

@@ -249 +249 @@
-  return link_to($image, $route, $options);
-}
+
+/**
+ * Generates url for a blog post
+ *
+ * @return string
+ */
+function blog_post_url($local_event, $absolute = false)
+{
+  $route = _gen_local_event_route($local_event);
+  return url_for($route, $absolute);
+}
+
+/**
+ * Generates a link to a blog post
+ *
+ * @param  LocalEvent $local_event
+ * @param  mixed      $options
+ * @return string
+ */
+function link_to_local_event($local_event, $options = null)
+{
+  $local_event_route = _gen_local_event_route($local_event);
+  return link_to($local_event->getTitle(), $local_event_route, $options);
+}
+
+/**
+ * Generates a link to a local event
+ *
+ * @param  LocalEvent $local_event
+ * @return string
+ */
+function _gen_local_event_route($local_event)
+{
+  if (is_null($local_event))
+  {
+    return null;
+  }
+  if (!$local_event instanceof LocalEvent)
+  {
+    $local_event = $local_event->getRawValue();
+  }
+  return $local_event->getRoute();
+}