HTML forms with id #ajax-form will be submited by ajax automatically

- fixing some bugfixes - all controllers under admin/ should require login - plugins admin interface should require at least one permission (ActionItem2056)

HTML forms with id #ajax-form will be submited by ajax automatically
- fixing some bugfixes - all controllers under admin/ should require login - plugins admin interface should require at least one permission (ActionItem2056)
Joenio Costa
1 parent 5b9b6c8f
Showing 8 changed files with 25 additions and 4 deletions Show diff stats
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/plugins_controller.rb
app/controllers/admin_controller.rb
features/send_email_to_environment_members.feature
public/javascripts/application.js
test/functional/admin_controller_test.rb
test/functional/cms_controller_test.rb
test/functional/users_controller_test.rb
 class AdminPanelController < AdminController
-  before_filter :login_required
-  
   protect 'view_environment_admin_panel', :environment
   def boxes_holder
 class PluginsController < AdminController
+  protect 'edit_environment_features', :environment
   def index
     @active_plugins = Noosfero::Plugin.all.map {|plugin_name| plugin_name.constantize }.compact
 class AdminController < ApplicationController
   require_ssl
+  before_filter :login_required
 end
@@ -5,7 +5,7 @@ Feature: send emails to environment members users
   Scenario: Cant access if not logged in
     Given I am not logged in
     When I go to /admin/users/send_mail
-    Then I should see "Access denied"
+    Then I should be on login page
   Scenario: Cant access as normal user
     Given the following user
@@ -677,3 +677,18 @@ function original_image_dimensions(src) {
   img.src = src;
   return { 'width' : img.width, 'height' : img.height };
 }
+
+jQuery(function() {
+  jQuery("#ajax-form").before("<div id='ajax-form-loading-area' style='display:block;width:16px;height:16px;'></div>");
+  jQuery("#ajax-form").before("<div id='ajax-form-message-area'></div>");
+  jQuery("#ajax-form").ajaxForm({
+    beforeSubmit: function(a,f,o) {
+      jQuery('#ajax-form-message-area').html('');
+      o.loading = small_loading('ajax-form-loading-area');
+    },
+    success: function() {
+      loading_done('ajax-form-loading-area');
+    },
+    target: "#ajax-form-message-area"
+  })
+});
@@ -25,6 +25,7 @@ class AdminControllerTest &lt; Test::Unit::TestCase
   end
   should 'detect ssl' do
+    login_as 'ze'
     @request.expects(:ssl?).returns(true).at_least_once
     get :index
     assert_response :success
@@ -16,6 +16,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     @profile = create_user_with_permission('testinguser', 'post_content')
     login_as :testinguser
+    @controller.stubs(:user).returns(@profile)
   end
   attr_reader :profile
@@ -614,7 +615,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
   should 'not make enterprise homepage available to person' do
-    @controller.stubs(:profile).returns(create_user('test_user').person)
+    @controller.stubs(:profile).returns(profile)
     assert_not_includes @controller.available_article_types, EnterpriseHomepage
   end
@@ -1278,6 +1279,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     c = Community.create!(:name => 'test_comm', :identifier => 'test_comm')
     u = create_user_with_permission('test_user', 'publish_content', c)
     login_as :test_user
+    @controller.stubs(:user).returns(u)
     get :new, :profile => c.identifier, :type => 'TinyMceArticle'
     assert_response :success
@@ -1311,6 +1313,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     u = create_user_with_permission('test_user', 'publish_content', c)
     a = c.articles.create!(:name => 'test_article', :last_changed_by => u)
     login_as :test_user
+    @controller.stubs(:user).returns(u)
     get :edit, :profile => c.identifier, :id => a.id
@@ -15,6 +15,8 @@ class UsersControllerTest &lt; Test::Unit::TestCase
   end
   should 'not access without right permission' do
+    create_user('guest')
+    login_as 'guest'
     get :index
     assert_response 403 # forbidden
   end
1	class AdminPanelController < AdminController	1	class AdminPanelController < AdminController
2		2
3	- before_filter :login_required
4	-
5	protect 'view_environment_admin_panel', :environment	3	protect 'view_environment_admin_panel', :environment
6		4
7	def boxes_holder	5	def boxes_holder
1	class PluginsController < AdminController	1	class PluginsController < AdminController
		2	+ protect 'edit_environment_features', :environment
2		3
3	def index	4	def index
4	@active_plugins = Noosfero::Plugin.all.map {\|plugin_name\| plugin_name.constantize }.compact	5	@active_plugins = Noosfero::Plugin.all.map {\|plugin_name\| plugin_name.constantize }.compact
1	class AdminController < ApplicationController	1	class AdminController < ApplicationController
2	require_ssl	2	require_ssl
		3	+ before_filter :login_required
3	end	4	end
	@@ -5,7 +5,7 @@ Feature: send emails to environment members users		@@ -5,7 +5,7 @@ Feature: send emails to environment members users
5	Scenario: Cant access if not logged in	5	Scenario: Cant access if not logged in
6	Given I am not logged in	6	Given I am not logged in
7	When I go to /admin/users/send_mail	7	When I go to /admin/users/send_mail
8	- Then I should see "Access denied"	8	+ Then I should be on login page
9		9
10	Scenario: Cant access as normal user	10	Scenario: Cant access as normal user
11	Given the following user	11	Given the following user
	@@ -677,3 +677,18 @@ function original_image_dimensions(src) {		@@ -677,3 +677,18 @@ function original_image_dimensions(src) {
677	img.src = src;	677	img.src = src;
678	return { 'width' : img.width, 'height' : img.height };	678	return { 'width' : img.width, 'height' : img.height };
679	}	679	}
		680	+
		681	+jQuery(function() {
		682	+ jQuery("#ajax-form").before("<div id='ajax-form-loading-area' style='display:block;width:16px;height:16px;'></div>");
		683	+ jQuery("#ajax-form").before("<div id='ajax-form-message-area'></div>");
		684	+ jQuery("#ajax-form").ajaxForm({
		685	+ beforeSubmit: function(a,f,o) {
		686	+ jQuery('#ajax-form-message-area').html('');
		687	+ o.loading = small_loading('ajax-form-loading-area');
		688	+ },
		689	+ success: function() {
		690	+ loading_done('ajax-form-loading-area');
		691	+ },
		692	+ target: "#ajax-form-message-area"
		693	+ })
		694	+});
	@@ -25,6 +25,7 @@ class AdminControllerTest < Test::Unit::TestCase		@@ -25,6 +25,7 @@ class AdminControllerTest < Test::Unit::TestCase
25	end	25	end
26		26
27	should 'detect ssl' do	27	should 'detect ssl' do
		28	+ login_as 'ze'
28	@request.expects(:ssl?).returns(true).at_least_once	29	@request.expects(:ssl?).returns(true).at_least_once
29	get :index	30	get :index
30	assert_response :success	31	assert_response :success