diff --git a/app/controllers/my_profile/profile_editor_controller.rb b/app/controllers/my_profile/profile_editor_controller.rb index 88961e2..1540840 100644 --- a/app/controllers/my_profile/profile_editor_controller.rb +++ b/app/controllers/my_profile/profile_editor_controller.rb @@ -12,6 +12,7 @@ class ProfileEditorController < MyProfileController FavoriteLinksProfile ListBlock ProfileInfoBlock + ViewArticle ] end diff --git a/app/design_blocks/view_article/controllers/view_article_controller.rb b/app/design_blocks/view_article/controllers/view_article_controller.rb index e5f57e4..eca4b87 100644 --- a/app/design_blocks/view_article/controllers/view_article_controller.rb +++ b/app/design_blocks/view_article/controllers/view_article_controller.rb @@ -38,6 +38,7 @@ class ViewArticleController < ApplicationController ########################### def edit + @articles = @profile.articles design_render_on_edit end @@ -46,5 +47,4 @@ class ViewArticleController < ApplicationController design_render_on_edit :nothing => true end - end diff --git a/app/design_blocks/view_article/models/view_article.rb b/app/design_blocks/view_article/models/view_article.rb index 1e2018b..877ef7f 100644 --- a/app/design_blocks/view_article/models/view_article.rb +++ b/app/design_blocks/view_article/models/view_article.rb @@ -12,20 +12,16 @@ class ViewArticle < Design::Block 'ViewArticle' end - def page - self.settings[:page] + def article_id + self.settings[:article_id] end - - def page= value - self.settings[:page] = value - end - - def profile - self.settings[:page] + + def article_id= value + self.settings[:article_id] = value end - def profile= value - self.settings[:page] = value + def article + Article.find(article_id) if article_id end end diff --git a/app/design_blocks/view_article/views/edit.rhtml b/app/design_blocks/view_article/views/edit.rhtml index a913754..99cf37b 100644 --- a/app/design_blocks/view_article/views/edit.rhtml +++ b/app/design_blocks/view_article/views/edit.rhtml @@ -8,7 +8,7 @@

- <%= text_field 'design_block', 'page'%> + <%= select 'design_block', 'article_id', @articles.map{|a|[a.full_name, a.id]} %>

<%= submit_tag _('Save') %> diff --git a/app/design_blocks/view_article/views/index.rhtml b/app/design_blocks/view_article/views/index.rhtml index 232e36a..a9f1752 100644 --- a/app/design_blocks/view_article/views/index.rhtml +++ b/app/design_blocks/view_article/views/index.rhtml @@ -1 +1 @@ -<%= render_component(:controller => 'content_viewer', :action => 'view_page', :params => {:profile => @profile.identifier, :page => [@design_block.page], :no_layout => true}) %> +<%= @design_block.article.to_html if @design_block.article %> diff --git a/app/models/person_info.rb b/app/models/person_info.rb index c7c6bb1..cd1aa0f 100644 --- a/app/models/person_info.rb +++ b/app/models/person_info.rb @@ -3,7 +3,7 @@ class PersonInfo < ActiveRecord::Base belongs_to :person def summary - ['name', 'sex', 'birth_date', 'address', 'city', 'state', 'country'].map do |col| + ['name', 'contact_information', 'sex', 'birth_date', 'address', 'city', 'state', 'country'].map do |col| [ PersonInfo.columns_hash[col] && PersonInfo.columns_hash[col].human_name, self.send(col) ] end end diff --git a/test/unit/person_info_test.rb b/test/unit/person_info_test.rb index d62dfb3..7a67d7e 100644 --- a/test/unit/person_info_test.rb +++ b/test/unit/person_info_test.rb @@ -20,7 +20,7 @@ class PersonInfoTest < Test::Unit::TestCase summary = person_info.summary assert(summary.any? { |line| line[1] == 'person name' }) assert(summary.any? { |line| line[1] == 'my address' }) - assert(summary.any? { |line| line[1] == 'my contact information' }) + assert(summary.any? { |line| line[1] == 'my contact information' }, "summary (#{summary.map{|l| l[1] }.compact.join("; ")}) do not contain 'my contact informatidon'") end end -- libgit2 0.21.2