Download as
Browse Code »

Commit 6fb030d43d418f61bf354e7825e4bded2fea2945

Authored by JoenioCosta
1 parent 86f07a0e
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

ActionItem378: admin set organization to closed 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1844 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 13 additions and 0 deletions   Show diff stats
app/controllers/my_profile/memberships_controller.rb
  Diff comments   View file @6fb030d
@@ -10,6 +10,7 @@ class MembershipsController < MyProfileController @@ -10,6 +10,7 @@ class MembershipsController < MyProfileController
10 @to_join = Profile.find(params[:id]) 10 @to_join = Profile.find(params[:id])
11 if request.post? && params[:confirmation] 11 if request.post? && params[:confirmation]
12 @to_join.add_member(profile) 12 @to_join.add_member(profile)
  13 + flash[:notice] = _('%s administrador still needs to accept you as member.') % @to_join.name if @to_join.closed?
13 redirect_to @to_join.url 14 redirect_to @to_join.url
14 end 15 end
15 end 16 end
app/views/profile_editor/_organization.rhtml
  Diff comments   View file @6fb030d
@@ -6,3 +6,8 @@ @@ -6,3 +6,8 @@
6 <%= f.text_field(:economic_activity) %> 6 <%= f.text_field(:economic_activity) %>
7 <%= f.text_area(:management_information, :rows => 5) %> 7 <%= f.text_area(:management_information, :rows => 5) %>
8 <%= f.text_area(:description, :rows => 5) if @profile.kind_of?(Community) %> 8 <%= f.text_area(:description, :rows => 5) if @profile.kind_of?(Community) %>
  9 + <h1><%= _('Moderation options') %></h1>
  10 + <p>
  11 + <%= check_box 'profile_data', 'closed' %>
  12 + <%= _("Closed %s") % @profile.class.name.humanize.downcase %>
  13 + </p>
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @6fb030d
@@ -277,4 +277,11 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase @@ -277,4 +277,11 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
277 post :edit, :profile => 'test_profile', :profile_data => { :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png') } } 277 post :edit, :profile => 'test_profile', :profile_data => { :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png') } }
278 assert_not_nil assigns(:profile).image 278 assert_not_nil assigns(:profile).image
279 end 279 end
  280 +
  281 + should 'show field to set closed organization' do
  282 + org = Organization.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact')
  283 + get :edit, :profile => 'testorg'
  284 + assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'profile_data[closed]' }
  285 + end
  286 +
280 end 287 end