deactive_and_active_profile: Change to manage only organizations profiles status

(ActionItem3287) Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Parley Martins <parley@outlook.com>

deactive_and_active_profile: Change to manage only organizations profiles status
(ActionItem3287) Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Parley Martins <parley@outlook.com>
Arthur Esposte · Luciano Prestes
1 parent 99de90c2
Showing 7 changed files with 86 additions and 70 deletions Show diff stats
app/controllers/admin/admin_panel_controller.rb
app/models/enterprise.rb
app/models/profile.rb
app/views/admin_panel/index.html.erb
app/views/admin_panel/manage_organizations_status.html.erb
app/views/admin_panel/manage_profile_status.html.erb
test/unit/profile_test.rb
@@ -72,10 +72,10 @@ class AdminPanelController &lt; AdminController
     end
   end
-  def manage_profile_status
-    scope = environment.profiles
+  def manage_organizations_status
+    scope = environment.organizations
     @filter = params[:filter] || 'any'
-    @title = "All profiles"
+    @title = "Organization profiles"
     @title = @title+" - "+@filter if @filter != 'any'
     if @filter == 'enabled'
@@ -87,6 +87,6 @@ class AdminPanelController &lt; AdminController
     scope = scope.order('name ASC')
     @q = params[:q]
-    @collection = find_by_contents(:people, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
+    @collection = find_by_contents(:organizations, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
   end
 end
@@ -107,7 +107,12 @@ class Enterprise &lt; Organization
     self.tasks.where(:type => 'EnterpriseActivation').first
   end
-  def enable(owner)
+  def enable(owner = nil)
+    if owner.nil?
+      self.visible = true
+      return self.save
+    end
+
     return if enabled
     # must be set first for the following to work
     self.enabled = true
@@ -899,6 +899,8 @@ private :generate_url, :url_options
   end
   def disable
+    self.visible = false
+    self.save
   end
   def enable
@@ -20,7 +20,7 @@
   <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
   <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
   <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
-  <tr><td><%= link_to _('Manage profiles status'), :action => 'manage_profile_status' %></td></tr>
+  <tr><td><%= link_to _('Manage organizations status'), :action => 'manage_organizations_status' %></td></tr>
 </table>
@@ -0,0 +1,64 @@
+<h1><%= _('Manage organizations') %></h1>
+
+<%= form_tag( { :action => 'manage_organizations_status' }, :method => 'get', :class => 'users-search' ) do %>
+
+  <div class="search-field">
+    <span class="formfield">
+      <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
+    </span>
+
+    <%= submit_button(:search, _('Search')) %>
+  </div>
+
+  <div class="environment-users-results-header">
+    <div id='environment-users-filter-title'><%= @title %></div>
+
+    <div id="environment-users-filter-filter">
+      <strong><%= _("Filter by: ") %></strong>
+
+      <select id="profile_filter_select">
+        <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
+      </select>
+    </div>
+    <div style="clear: both"></div>
+  </div>
+
+  <table>
+    <colgroup>
+      <col width="80%">
+      <col width="20%">
+    </colgroup>
+
+    <tr>
+      <th><%= _('Member') %></th>
+      <th><%= _('Actions') %></th>
+    </tr>
+
+    <% @collection.each do |p| %>
+      <tr title="<%= p.name %>">
+        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
+
+        <td class='actions'>
+          <div class="members-buttons-cell">
+            <% if p.visible %>
+              <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller=>"profile_editor", :action => 'deactivate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
+            <% else %>
+              <%= button_without_text :'activate-user', _('Activate'), {:controller=>"profile_editor", :action => 'activate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to activate this profile ?") %>
+            <% end %>
+         </div>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+
+<% end %>
+
+<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
+
+<script type="text/javascript">
+  jQuery(document).ready(function(){
+    jQuery("#profile_filter_select").change(function(){
+      document.location.href = '/admin/admin_panel/manage_organizations_status?filter='+this.value;
+    });
+  });
+</script>
 \ No newline at end of file
@@ -1,64 +0,0 @@
-<h1><%= _('Manage profiles') %></h1>
-
-<%= form_tag( { :action => 'manage_profile_status' }, :method => 'get', :class => 'users-search' ) do %>
-
-  <div class="search-field">
-    <span class="formfield">
-      <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
-    </span>
-
-    <%= submit_button(:search, _('Search')) %>
-  </div>
-
-  <div class="environment-users-results-header">
-    <div id='environment-users-filter-title'><%= @title %></div>
-
-    <div id="environment-users-filter-filter">
-      <strong><%= _("Filter by: ") %></strong>
-
-      <select id="profile_filter_select">
-        <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
-      </select>
-    </div>
-    <div style="clear: both"></div>
-  </div>
-
-  <table>
-    <colgroup>
-      <col width="80%">
-      <col width="20%">
-    </colgroup>
-
-    <tr>
-      <th><%= _('Member') %></th>
-      <th><%= _('Actions') %></th>
-    </tr>
-
-    <% @collection.each do |p| %>
-      <tr title="<%= p.name %>">
-        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
-
-        <td class='actions'>
-          <div class="members-buttons-cell">
-            <% if p.visible %>
-              <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller=>"profile_editor", :action => 'deactivate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
-            <% else %>
-              <%= button_without_text :'activate-user', _('Activate'), {:controller=>"profile_editor", :action => 'activate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to activate this profile ?") %>
-            <% end %>
-         </div>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-
-<% end %>
-
-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
-
-<script type="text/javascript">
-  jQuery(document).ready(function(){
-    jQuery("#profile_filter_select").change(function(){
-      document.location.href = '/admin/admin_panel/manage_profile_status?filter='+this.value;
-    });
-  });
-</script>
 \ No newline at end of file
@@ -1955,4 +1955,13 @@ class ProfileTest &lt; ActiveSupport::TestCase
     p = fast_create(Profile)
     assert p.folder_types.include?('ProfileTest::Folder1')
   end
+
+  should 'enable profile visibility' do
+    profile = fast_create(Profile)
+
+    assert profile.enable, _("Profile should have been enabled")
+    assert profile.visible, _("Profile should be visible")
+    profile.disable
+    assert !profile.visible, _("Profile should not be visible")
+  end
 end
	@@ -899,6 +899,8 @@ private :generate_url, :url_options		@@ -899,6 +899,8 @@ private :generate_url, :url_options
899	end	899	end
900		900
901	def disable	901	def disable
		902	+ self.visible = false
		903	+ self.save
902	end	904	end
903		905
904	def enable	906	def enable
	@@ -20,7 +20,7 @@		@@ -20,7 +20,7 @@
20	<tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>	20	<tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
21	<tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>	21	<tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
22	<tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>	22	<tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
23	- <tr><td><%= link_to _('Manage profiles status'), :action => 'manage_profile_status' %></td></tr>	23	+ <tr><td><%= link_to _('Manage organizations status'), :action => 'manage_organizations_status' %></td></tr>
24	</table>	24	</table>
25		25
26		26
	@@ -0,0 +1,64 @@		@@ -0,0 +1,64 @@
		1	+<h1><%= _('Manage organizations') %></h1>
		2	+
		3	+<%= form_tag( { :action => 'manage_organizations_status' }, :method => 'get', :class => 'users-search' ) do %>
		4	+
		5	+ <div class="search-field">
		6	+ <span class="formfield">
		7	+ <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
		8	+ </span>
		9	+
		10	+ <%= submit_button(:search, _('Search')) %>
		11	+ </div>
		12	+
		13	+ <div class="environment-users-results-header">
		14	+ <div id='environment-users-filter-title'><%= @title %></div>
		15	+
		16	+ <div id="environment-users-filter-filter">
		17	+ <strong><%= _("Filter by: ") %></strong>
		18	+
		19	+ <select id="profile_filter_select">
		20	+ <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
		21	+ </select>
		22	+ </div>
		23	+ <div style="clear: both"></div>
		24	+ </div>
		25	+
		26	+ <table>
		27	+ <colgroup>
		28	+ <col width="80%">
		29	+ <col width="20%">
		30	+ </colgroup>
		31	+
		32	+ <tr>
		33	+ <th><%= _('Member') %></th>
		34	+ <th><%= _('Actions') %></th>
		35	+ </tr>
		36	+
		37	+ <% @collection.each do \|p\| %>
		38	+ <tr title="<%= p.name %>">
		39	+ <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
		40	+
		41	+ <td class='actions'>
		42	+ <div class="members-buttons-cell">
		43	+ <% if p.visible %>
		44	+ <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller=>"profile_editor", :action => 'deactivate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
		45	+ <% else %>
		46	+ <%= button_without_text :'activate-user', _('Activate'), {:controller=>"profile_editor", :action => 'activate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to activate this profile ?") %>
		47	+ <% end %>
		48	+ </div>
		49	+ </td>
		50	+ </tr>
		51	+ <% end %>
		52	+ </table>
		53	+
		54	+<% end %>
		55	+
		56	+<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
		57	+
		58	+<script type="text/javascript">
		59	+ jQuery(document).ready(function(){
		60	+ jQuery("#profile_filter_select").change(function(){
		61	+ document.location.href = '/admin/admin_panel/manage_organizations_status?filter='+this.value;
		62	+ });
		63	+ });
		64	+</script>
0	\ No newline at end of file	65	\ No newline at end of file
	@@ -1,64 +0,0 @@		@@ -1,64 +0,0 @@
1	-<h1><%= _('Manage profiles') %></h1>
2	-
3	-<%= form_tag( { :action => 'manage_profile_status' }, :method => 'get', :class => 'users-search' ) do %>
4	-
5	- <div class="search-field">
6	- <span class="formfield">
7	- <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
8	- </span>
9	-
10	- <%= submit_button(:search, _('Search')) %>
11	- </div>
12	-
13	- <div class="environment-users-results-header">
14	- <div id='environment-users-filter-title'><%= @title %></div>
15	-
16	- <div id="environment-users-filter-filter">
17	- <strong><%= _("Filter by: ") %></strong>
18	-
19	- <select id="profile_filter_select">
20	- <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
21	- </select>
22	- </div>
23	- <div style="clear: both"></div>
24	- </div>
25	-
26	- <table>
27	- <colgroup>
28	- <col width="80%">
29	- <col width="20%">
30	- </colgroup>
31	-
32	- <tr>
33	- <th><%= _('Member') %></th>
34	- <th><%= _('Actions') %></th>
35	- </tr>
36	-
37	- <% @collection.each do \|p\| %>
38	- <tr title="<%= p.name %>">
39	- <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
40	-
41	- <td class='actions'>
42	- <div class="members-buttons-cell">
43	- <% if p.visible %>
44	- <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller=>"profile_editor", :action => 'deactivate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
45	- <% else %>
46	- <%= button_without_text :'activate-user', _('Activate'), {:controller=>"profile_editor", :action => 'activate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to activate this profile ?") %>
47	- <% end %>
48	- </div>
49	- </td>
50	- </tr>
51	- <% end %>
52	- </table>
53	-
54	-<% end %>
55	-
56	-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
57	-
58	-<script type="text/javascript">
59	- jQuery(document).ready(function(){
60	- jQuery("#profile_filter_select").change(function(){
61	- document.location.href = '/admin/admin_panel/manage_profile_status?filter='+this.value;
62	- });
63	- });
64	-</script>
65	\ No newline at end of file	0	\ No newline at end of file
	@@ -1955,4 +1955,13 @@ class ProfileTest < ActiveSupport::TestCase		@@ -1955,4 +1955,13 @@ class ProfileTest < ActiveSupport::TestCase
1955	p = fast_create(Profile)	1955	p = fast_create(Profile)
1956	assert p.folder_types.include?('ProfileTest::Folder1')	1956	assert p.folder_types.include?('ProfileTest::Folder1')
1957	end	1957	end
		1958	+
		1959	+ should 'enable profile visibility' do
		1960	+ profile = fast_create(Profile)
		1961	+
		1962	+ assert profile.enable, _("Profile should have been enabled")
		1963	+ assert profile.visible, _("Profile should be visible")
		1964	+ profile.disable
		1965	+ assert !profile.visible, _("Profile should not be visible")
		1966	+ end
1958	end	1967	end