ActionItem1202: removing option to moderate new members for enterprise

* only admin can add users, so moderation is not needed

ActionItem1202: removing option to moderate new members for enterprise
* only admin can add users, so moderation is not needed
Daniela Feitosa · Antonio Terceiro
1 parent 6bcae58c
Showing 2 changed files with 38 additions and 29 deletions Show diff stats
app/views/profile_editor/_organization.rhtml
test/functional/profile_editor_controller_test.rb
@@ -63,23 +63,24 @@
   <%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
   <h1><%= _('Moderation options') %></h1>
-  <div style='margin-bottom: 1em'>
-  <%= _('New members must be approved:')%>
-  </div>
-  <div style='margin-bottom: 0.5em'>
-    <%= radio_button 'profile_data', 'closed', 'true', :style => 'float: left' %>
-    <div style='margin-left: 30px'>
-      <%= _('<strong>Before</strong> joining this group (a moderator has to accept the member in pending request before member can access the intranet and/or the website).') %>
+  <% if profile.community? %>
+    <div style='margin-bottom: 1em'>
+    <%= _('New members must be approved:')%>
     </div>
-  </div>
-  <div>
-    <%= radio_button 'profile_data', 'closed', 'false', :style => 'float: left' %>
-    <div style='margin-left: 30px'>
-      <%= _('<strong>After</strong> joining this group (a moderator can always desactivate access for users later).') %>
+    <div style='margin-bottom: 0.5em'>
+      <%= radio_button 'profile_data', 'closed', 'true', :style => 'float: left' %>
+      <div style='margin-left: 30px'>
+        <%= _('<strong>Before</strong> joining this group (a moderator has to accept the member in pending request before member can access the intranet and/or the website).') %>
+      </div>
     </div>
-  </div>
-  
-  <br>
+    <div>
+      <%= radio_button 'profile_data', 'closed', 'false', :style => 'float: left' %>
+      <div style='margin-left: 30px'>
+        <%= _('<strong>After</strong> joining this group (a moderator can always desactivate access for users later).') %>
+      </div>
+    </div>
+    <br>
+  <% end %>
   <div style='margin-bottom: 1em'>
   <%= _('New articles posted by members of this group must be approved:')%>
@@ -302,31 +302,23 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
     assert_not_nil assigns(:profile).image
   end
-  should 'display closed attribute for enterprise when it is set' do
-    org = Enterprise.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => true, :environment => Environment.default)
+  should 'display closed attribute for communities when it is set' do
+    org = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => true, :environment => Environment.default)
     get :edit, :profile => 'testorg'
     assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'true', :checked => 'checked' }
     assert_no_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'false', :checked =>  'checked' }
   end
-  should 'display closed attribute for organizations when it is set' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => true, :environment => Environment.default)
-    get :edit, :profile => 'testorg'
-
-    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'true', :checked => 'checked' }
-    assert_no_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'false', :checked =>  'checked' }
-  end
-
-  should 'display closed attribute for organizations when it is set to false' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => false)
+  should 'display closed attribute for communities when it is set to false' do
+    org = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => false)
     get :edit, :profile => 'testorg'
     assert_no_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'true', :checked => 'checked' }
     assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'false', :checked => 'checked' }
   end
-  should 'display closed attribute for organizations when it is set to nothing at all' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => nil)
+  should 'display closed attribute for communities when it is set to nothing at all' do
+    org = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => nil)
     get :edit, :profile => 'testorg'
     assert_no_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'true', :checked => 'checked' }
     assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'false', :checked => 'checked' }
@@ -348,6 +340,22 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
     assert !org.closed
   end
+  should 'not display option to close when it is enterprise' do
+    org = Enterprise.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :environment => Environment.default)
+    get :edit, :profile => 'testorg'
+
+    assert_no_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'true' }
+    assert_no_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'false' }
+  end
+
+  should 'display option to close when it is community' do
+    org = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :environment => Environment.default)
+    get :edit, :profile => 'testorg'
+
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'true' }
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'false' }
+  end
+
   should 'display manage members options if has permission' do
     profile = Profile['ze']
     community = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :environment => Environment.default)