Download as
Browse Code »

Commit 3d5ee0f63502001c0f75438a344e2162d76c9e51

Authored by AntonioTerceiro
1 parent c09bb60a
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem153: adding a description attribute to Environment class and displayin… 

…g it in the root of the site


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1295 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 40 additions and 10 deletions   Show diff stats
app/controllers/admin/admin_panel_controller.rb
  Diff comments   View file @3d5ee0f
@@ -12,6 +12,14 @@ class AdminPanelController < AdminController @@ -12,6 +12,14 @@ class AdminPanelController < AdminController
12 environment 12 environment
13 end 13 end
14 14
  15 + def site_info
  16 + if request.post?
  17 + if @environment.update_attributes(params[:environment])
  18 + redirect_to :action => 'index'
  19 + end
  20 + end
  21 + end
  22 +
15 protected 23 protected
16 24
17 def load_default_enviroment 25 def load_default_enviroment
app/views/admin_panel/index.rhtml
  Diff comments   View file @3d5ee0f
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 <p><%= _('You, as an environment administrator, has the following options:')%></p> 3 <p><%= _('You, as an environment administrator, has the following options:')%></p>
4 4
5 <ul> 5 <ul>
  6 + <li><%= link_to _('Edit site info'), :action => 'site_info' %></li>
6 <li><%= link_to _('Enable/disable features'), :controller => 'features' %></li> 7 <li><%= link_to _('Enable/disable features'), :controller => 'features' %></li>
7 <li><%= link_to _('Edit the Visual Design'), :controller => 'edit_template'%></li> 8 <li><%= link_to _('Edit the Visual Design'), :controller => 'edit_template'%></li>
8 <li><%= link_to _('Manage Categories'), :controller => 'categories'%></li> 9 <li><%= link_to _('Manage Categories'), :controller => 'categories'%></li>
app/views/admin_panel/site_info.rhtml 0 → 100644
  Diff comments   View file @3d5ee0f
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
  1 +<h2><%= _('Site info') %></h2>
  2 +
  3 +<%= render :file => 'shared/tiny_mce' %>
  4 +
  5 +<% labelled_form_for :environment, @environment do |f| %>
  6 +
  7 + <%= f.text_area :description %>
  8 +
  9 + <% button_bar do %>
  10 + <%= submit_button(:save, _('Save')) %>
  11 + <%= button(:cancel, _('Cancel'), :action => 'index') %>
  12 + <% end %>
  13 +
  14 +<% end %>
app/views/home/index.rhtml
  Diff comments   View file @3d5ee0f
1 <%= flash[:notice] %> 1 <%= flash[:notice] %>
2 2
3 -<h1><%= @environment.name %></h1>  
4 -  
5 -<h2><%= _('Recent articles') %></h2>  
6 -  
7 -<% for article in @articles %>  
8 - <h2><%= article.name %></h2>  
9 - <div>  
10 - <%= article.to_html %>  
11 - </div>  
12 -<% end %> 3 +<%= @environment.description %>
test/functional/admin_panel_controller_test.rb
  Diff comments   View file @3d5ee0f
@@ -17,10 +17,26 @@ class AdminPanelControllerTest &lt; Test::Unit::TestCase @@ -17,10 +17,26 @@ class AdminPanelControllerTest &lt; Test::Unit::TestCase
17 def test_index 17 def test_index
18 get :index 18 get :index
19 assert_template 'index' 19 assert_template 'index'
  20 + assert_tag :tag => 'a', :attributes => { :href => /site_info/ }
20 assert_tag :tag => 'a', :attributes => { :href => /categories/ } 21 assert_tag :tag => 'a', :attributes => { :href => /categories/ }
21 assert_tag :tag => 'a', :attributes => { :href => /edit_template/ } 22 assert_tag :tag => 'a', :attributes => { :href => /edit_template/ }
22 assert_tag :tag => 'a', :attributes => { :href => /features/ } 23 assert_tag :tag => 'a', :attributes => { :href => /features/ }
23 assert_tag :tag => 'a', :attributes => { :href => /role/ } 24 assert_tag :tag => 'a', :attributes => { :href => /role/ }
24 assert_tag :tag => 'a', :attributes => { :href => /region_validators/ } 25 assert_tag :tag => 'a', :attributes => { :href => /region_validators/ }
25 end 26 end
  27 +
  28 + should 'display form for editing site info' do
  29 + get :site_info
  30 + assert_template 'site_info'
  31 + assert_tag :tag => 'textarea', :attributes => { :name => 'environment[description]'}
  32 + end
  33 +
  34 + should 'save site description' do
  35 +
  36 + post :site_info, :environment => { :description => "This is my new environment" }
  37 + assert_redirected_to :action => 'index'
  38 +
  39 + assert_equal "This is my new environment", Environment.default.description
  40 + end
  41 +
26 end 42 end