remove trailing white-spaces from app/controllers/watchers_controller.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6804 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
c3a9d10e3b
commit
b22fe90370
@ -5,12 +5,12 @@
|
|||||||
# modify it under the terms of the GNU General Public License
|
# modify it under the terms of the GNU General Public License
|
||||||
# as published by the Free Software Foundation; either version 2
|
# as published by the Free Software Foundation; either version 2
|
||||||
# of the License, or (at your option) any later version.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
@ -19,11 +19,11 @@ class WatchersController < ApplicationController
|
|||||||
before_filter :find_project
|
before_filter :find_project
|
||||||
before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
|
before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
|
||||||
before_filter :authorize, :only => [:new, :destroy]
|
before_filter :authorize, :only => [:new, :destroy]
|
||||||
|
|
||||||
verify :method => :post,
|
verify :method => :post,
|
||||||
:only => [ :watch, :unwatch ],
|
:only => [ :watch, :unwatch ],
|
||||||
:render => { :nothing => true, :status => :method_not_allowed }
|
:render => { :nothing => true, :status => :method_not_allowed }
|
||||||
|
|
||||||
def watch
|
def watch
|
||||||
if @watched.respond_to?(:visible?) && !@watched.visible?(User.current)
|
if @watched.respond_to?(:visible?) && !@watched.visible?(User.current)
|
||||||
render_403
|
render_403
|
||||||
@ -31,11 +31,11 @@ class WatchersController < ApplicationController
|
|||||||
set_watcher(User.current, true)
|
set_watcher(User.current, true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def unwatch
|
def unwatch
|
||||||
set_watcher(User.current, false)
|
set_watcher(User.current, false)
|
||||||
end
|
end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@watcher = Watcher.new(params[:watcher])
|
@watcher = Watcher.new(params[:watcher])
|
||||||
@watcher.watchable = @watched
|
@watcher.watchable = @watched
|
||||||
@ -51,7 +51,7 @@ class WatchersController < ApplicationController
|
|||||||
rescue ::ActionController::RedirectBackError
|
rescue ::ActionController::RedirectBackError
|
||||||
render :text => 'Watcher added.', :layout => true
|
render :text => 'Watcher added.', :layout => true
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@watched.set_watcher(User.find(params[:user_id]), false) if request.post?
|
@watched.set_watcher(User.find(params[:user_id]), false) if request.post?
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
@ -63,7 +63,7 @@ class WatchersController < ApplicationController
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
def find_project
|
def find_project
|
||||||
klass = Object.const_get(params[:object_type].camelcase)
|
klass = Object.const_get(params[:object_type].camelcase)
|
||||||
@ -73,7 +73,7 @@ private
|
|||||||
rescue
|
rescue
|
||||||
render_404
|
render_404
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_watcher(user, watching)
|
def set_watcher(user, watching)
|
||||||
@watched.set_watcher(user, watching)
|
@watched.set_watcher(user, watching)
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user