<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>db/migrate/20090409190116_create_slugs.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,7 +1,8 @@
 class Admin::PeopleController &lt; ApplicationController
-    
+  before_filter :login_required    
   before_filter :find_person, :only =&gt; [:edit, :update, :destroy, :confirm_destroy]
-  before_filter :login_required
+  before_filter :ensure_current_person_url, :only =&gt; :show
+
   
   def index    
     @page_title = t('people_admin')
@@ -65,4 +66,9 @@ class Admin::PeopleController &lt; ApplicationController
     def find_person
       @person = Person.find(params[:id])
     end
+    
+    def ensure_current_person_url
+      redirect_to @person, :status =&gt; :moved_permanently if @person.has_better_id?
+    end
+    
 end</diff>
      <filename>app/controllers/admin/people_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,6 @@
 class PeopleController &lt; ApplicationController
   before_filter :find_person, :only =&gt; [:show, :tweetstream, :follow]
+  before_filter :ensure_current_person_url, :only =&gt; :show
   before_filter :login_required, :only =&gt; [:follow, :follow_all]
   
   def index
@@ -44,5 +45,10 @@ class PeopleController &lt; ApplicationController
       opts[:conditions] = [&quot;statuses.text like ?&quot;, &quot;%#{params[:q]}%&quot;] unless params[:q].blank?
       @tweets = @person.user.statuses.paginate opts
     end
+    
+    def ensure_current_person_url
+      redirect_to @person, :status =&gt; :moved_permanently if @person.has_better_id?
+    end
+    
 
 end</diff>
      <filename>app/controllers/people_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,6 @@
 class Person &lt; ActiveRecord::Base
+  has_friendly_id :display_name, :use_slug =&gt; true
+  
   belongs_to :user
   
   delegate :followers_count, :friends_count, :statuses_count, :profile_image_url, :description, :to =&gt; :user</diff>
      <filename>app/models/person.rb</filename>
    </modified>
    <modified>
      <diff>@@ -20,10 +20,10 @@
           %td.name= person.last_name
           %td.name= person.screen_name
           %td.actions
-            %a.button.small.edit{:href =&gt; edit_admin_person_path(person.id)}
+            %a.button.small.edit{:href =&gt; edit_admin_person_path(person)}
               = icon('pencil_small')
               = t('edit')
-            %a.button.small.remove{:href =&gt; confirm_destroy_admin_person_path(person.id)}
+            %a.button.small.remove{:href =&gt; confirm_destroy_admin_person_path(person)}
               = icon('cross_small')
               = t('remove')
     = will_paginate @people</diff>
      <filename>app/views/admin/people/index.html.haml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>cab44f6233033e5ed4e56c2843f95c0b5de88094</id>
    </parent>
  </parents>
  <author>
    <name>Wynn Netherland</name>
    <email>wynn@squeejee.com</email>
  </author>
  <url>http://github.com/squeejee/floxee/commit/600e80588415373e2c908bf8e293614f9519cfca</url>
  <id>600e80588415373e2c908bf8e293614f9519cfca</id>
  <committed-date>2009-04-09T12:10:33-07:00</committed-date>
  <authored-date>2009-04-09T12:10:33-07:00</authored-date>
  <message>Added friendly_id</message>
  <tree>36d22b53156b3a7a7fa17a0cb2dabac2574ad515</tree>
  <committer>
    <name>Wynn Netherland</name>
    <email>wynn@squeejee.com</email>
  </committer>
</commit>
