Merged r3784 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3793 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 16 insertions, 1 deletions

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 3bfa606e1..2a12cee0c 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -38,6 +38,7 @@ class MembersController < ApplicationController
       format.js { 
         render(:update) {|page| 
           page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+          page << 'hideOnLoad()'
           members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
         }
       }
@@ -51,6 +52,7 @@ class MembersController < ApplicationController
         format.js { 
           render(:update) {|page| 
             page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+            page << 'hideOnLoad()'
             page.visual_effect(:highlight, "member-#{@member.id}")
           }
         }
@@ -64,7 +66,11 @@ class MembersController < ApplicationController
     end
     respond_to do |format|
       format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
-      format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
+      format.js { render(:update) {|page|
+          page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+          page << 'hideOnLoad()'
+        }
+      }
     end
   end
   
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 57419d0b0..472f75830 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -207,3 +207,12 @@ Ajax.Responders.register({
         }
     }
 });
+
+function hideOnLoad() {
+  $$('.hol').each(function(el) {
+  	el.hide();
+	});
+}
+
+Event.observe(window, 'load', hideOnLoad);
+

path: root/tests/lib/ErrorHandlerTest.php

<?php
/**
 * ownCloud
 *
 * @author Bjoern Schiessle
 * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
 * License as published by the Free Software Foundation; either
 * version 3 of the License, or any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 *
 * You should have received a copy of the GNU Affero General Public
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *
 */

namespace Test;

class ErrorHandlerTest extends \Test\TestCase {

	/**
	 * provide username, password combinations for testRemovePassword
	 * @return array
	 */
	public function passwordProvider() {
		return [
			['user', 'password'],
			['user@owncloud.org', 'password'],
			['user', 'pass@word'],
			['us:er', 'password'],
			['user', 'pass:word'],
		];
	}

	/**
	 * @dataProvider passwordProvider
	 * @param string $username
	 * @param string $password
	 */
	public function testRemovePassword($username, $password) {
		$url = 'http://'.$username.':'.$password.'@owncloud.org';
		$expectedResult = 'http://xxx:xxx@owncloud.org';
		$result = TestableErrorHandler::testRemovePassword($url);

		$this->assertEquals($expectedResult, $result);
	}
}

/**
 * dummy class to access protected methods of \OC\Log\ErrorHandler
 */
class TestableErrorHandler extends \OC\Log\ErrorHandler {

	/**
	 * @param string $msg
	 */
	public static function testRemovePassword($msg) {
		return self::removePassword($msg);
	}
}