Download as
Browse Code »

Commit 55fbbbb6b391abb9e9989cb9ca8e72e77f1a2e5f

Authored by Rodrigo Souto
1 parent 3b316fad
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[template-welcome-page] Add welcome_page relation to profiles 

(ActionItem3075)
Showing 3 changed files with 15 additions and 0 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @55fbbbb
@@ -138,6 +138,11 @@ class Profile < ActiveRecord::Base @@ -138,6 +138,11 @@ class Profile < ActiveRecord::Base
138 138
139 has_many :comments_received, :class_name => 'Comment', :through => :articles, :source => :comments 139 has_many :comments_received, :class_name => 'Comment', :through => :articles, :source => :comments
140 140
  141 + # Although this should be a has_one relation, there are no non-silly names for
  142 + # a foreign key on article to reference the template to which it is
  143 + # welcome_page... =P
  144 + belongs_to :welcome_page, :class_name => 'Article', :dependent => :destroy
  145 +
141 def scraps(scrap=nil) 146 def scraps(scrap=nil)
142 scrap = scrap.is_a?(Scrap) ? scrap.id : scrap 147 scrap = scrap.is_a?(Scrap) ? scrap.id : scrap
143 scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap) 148 scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap)
db/migrate/20140409211533_add_welcome_page_id_to_profiles.rb 0 → 100644
  Diff comments   View file @55fbbbb
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class AddWelcomePageIdToProfiles < ActiveRecord::Migration
  2 + def self.up
  3 + add_column :profiles, :welcome_page_id, :integer
  4 + end
  5 +
  6 + def self.down
  7 + remove_column :profiles, :welcome_page_id
  8 + end
  9 +end
@@ -484,6 +484,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140605222753) do @@ -484,6 +484,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140605222753) do
484 t.integer "activities_count", :default => 0, :null => false 484 t.integer "activities_count", :default => 0, :null => false
485 t.string "personal_website" 485 t.string "personal_website"
486 t.string "jabber_id" 486 t.string "jabber_id"
  487 + t.integer "welcome_page_id"
487 end 488 end
488 489
489 add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count" 490 add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"