Permalink
Browse files

Removed work for pie from attendee profile

  • Loading branch information...
1 parent 5605cf2 commit f9eb09609269305e2678d915acbf9c25ea69e6fa @marioaquino marioaquino committed Aug 17, 2012
@@ -51,10 +51,6 @@ def github_link(github_id = '')
custom_link github_id, github_id, 'github.com'
end
- def work_for_pie_link(work_for_pie_id = '')
- custom_link work_for_pie_id, work_for_pie_id, 'workforpie.com', :protocol => 'http'
- end
-
def schedule_key
current_attendee_cred.nil? ? 'schedule' : 'auth-schedule'
end
@@ -36,11 +36,6 @@
<div><%= github_link attendee.github_id %></div>
<% end -%>
- <% unless attendee.work_for_pie_id.blank? -%>
- <div>WorkForPie</div>
- <div><%= work_for_pie_link attendee.work_for_pie_id %></div>
- <% end -%>
-
<% unless attendee.conference_sessions.empty? -%>
<div>My Schedule</div>
<div><%= link_to content_tag(:strong, t('.download_ical')), attendee_path(attendee, :format => :ics) %></div>
@@ -16,7 +16,6 @@
<%= attendee_form.input :company_url, :label => t('.company_url') %>
<%= attendee_form.input :twitter_id, :label => t('.twitter_id'), :hint => t('.twitter_hint') %>
<%= attendee_form.input :github_id, :label => t('.github_id'), :hint => t('.github_hint') %>
- <%= attendee_form.input :work_for_pie_id, :label => t('.work_for_pie_id'), :hint => t('.work_for_pie_hint') %>
<%= attendee_form.input :blog_url, :label => t('.blog_url') %>
<% end %>
<%= attendee_form.buttons do %>
View
@@ -28,8 +28,6 @@ en:
profile: Your Conference Profile
twitter_id: Twitter ID
twitter_hint: "https://twitter.com/<Your_ID> - no '@' symbol"
- work_for_pie_hint: "http://workforpie.com/<Your_ID>"
- work_for_pie_id: WorkForPie ID
index:
attendees: Conference Attendees
devise:
@@ -0,0 +1,9 @@
+class RemoveWorkForPieFromAttendees < ActiveRecord::Migration
+ def self.up
+ remove_column :attendees, :work_for_pie_id
+ end
+
+ def self.down
+ add_column :attendees, :work_for_pie_id, :string
+ end
+end
View
@@ -10,7 +10,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120502012420) do
+ActiveRecord::Schema.define(:version => 20120817005718) do
create_table "attendee_creds", :force => true do |t|
t.string "email", :default => "", :null => false
@@ -46,10 +46,10 @@
t.string "state"
t.integer "conf_year"
t.string "github_id"
- t.string "work_for_pie_id"
t.string "cached_slug"
t.string "company_url"
t.integer "attendee_cred_id"
+ t.text "bio"
@marioaquino

marioaquino Sep 9, 2012

Owner

The bio thing was added last year when I was working on the profile feature. Attendee bio got dropped. But I guess the field is still in there. It isn't used by anything.

end
add_index "attendees", ["cached_slug"], :name => "index_attendees_on_cached_slug", :unique => true
@@ -132,14 +132,13 @@
create_table "news_item_translations", :force => true do |t|
t.integer "news_item_id"
t.string "locale"
- t.string "external_url"
t.text "body"
+ t.string "external_url"
t.string "title"
t.datetime "created_at"
t.datetime "updated_at"
end
- add_index "news_item_translations", ["locale"], :name => "index_news_item_translations_on_locale"
@senior

senior Aug 28, 2012

Owner

Was the removal of this intentional? Same question for the other two below.

@marioaquino

marioaquino Sep 9, 2012

Owner

The news items translations index removal thing happened automatically. I didn't do it intentionally. Something I ran took it out.

add_index "news_item_translations", ["news_item_id"], :name => "index_news_item_translations_on_news_item_id"
create_table "news_items", :force => true do |t|
@@ -163,7 +162,6 @@
t.datetime "updated_at"
end
- add_index "page_part_translations", ["locale"], :name => "index_page_part_translations_on_locale"
add_index "page_part_translations", ["page_part_id"], :name => "index_page_part_translations_on_page_part_id"
create_table "page_parts", :force => true do |t|
@@ -187,7 +185,6 @@
t.datetime "updated_at"
end
- add_index "page_translations", ["locale"], :name => "index_page_translations_on_locale"
add_index "page_translations", ["page_id"], :name => "index_page_translations_on_page_id"
create_table "pages", :force => true do |t|
@@ -24,7 +24,6 @@ Feature: As an authenticated conference attendee, I can fill out and edit a prof
And I change the Company URL field to "http://mycompany.com"
And I change the Twitter ID field to "marioaquino"
And I change the GitHub ID field to "marioaquino"
- And I change the WorkForPie ID field to "MarioAquino"
And I change the Blog URL field to "http://marioaquino.blogspot.com"
When I press "Update Profile"
Then I should be on the profile page for Mario Crimefighter Aquino
@@ -33,7 +32,6 @@ Feature: As an authenticated conference attendee, I can fill out and edit a prof
And I should see a link with "Foo, Inc." to "http://mycompany.com"
And I should see a link with "@marioaquino" to "https://twitter.com/marioaquino"
And I should see a link with "marioaquino" to "https://github.com/marioaquino"
- And I should see a link with "MarioAquino" to "http://workforpie.com/MarioAquino"
And I should see a link with "http://marioaquino.blogspot.com" to "http://marioaquino.blogspot.com"
@@ -83,20 +83,6 @@ def make_parent(parent, *children)
end
end
- describe "#workforpie_link" do
- it "returns a link when a string is passed" do
- work_for_pie_link('foo').should == "<a href=\"http://workforpie.com/foo\" target=\"_blank\"><strong>foo</strong></a>"
- end
-
- it "returns nil if no workforpie id is supplied" do
- work_for_pie_link.should be_nil
- end
-
- it "returns nil if an empty string is supplied for workforpie id" do
- work_for_pie_link(nil).should be_nil
- end
- end
-
describe "#image_tag_for" do
#class MockView < ActionView::Base
#include ApplicationHelper

0 comments on commit f9eb096

Please sign in to comment.