diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-26 17:59:06 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-26 17:59:06 +0000 |
commit | 190fef513feaeee9a4f72302690ba95d7d392c4b (patch) | |
tree | ddb2cef869c8638f19558ee4570dd4e9f51c7e36 /app/controllers | |
parent | b9ef10fe3fb6e76e1c913a7c260d48b5feed8260 (diff) | |
download | redmine-190fef513feaeee9a4f72302690ba95d7d392c4b.tar.gz redmine-190fef513feaeee9a4f72302690ba95d7d392c4b.zip |
* project settings split in 4 tabs
* prototype.js upgraded to 1.5.0_rc1
git-svn-id: http://redmine.rubyforge.org/svn/trunk@181 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/issue_categories_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/members_controller.rb | 26 | ||||
-rw-r--r-- | app/controllers/projects_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/versions_controller.rb | 6 |
4 files changed, 22 insertions, 22 deletions
diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb index 7f2e4cbe2..1658e98c7 100644 --- a/app/controllers/issue_categories_controller.rb +++ b/app/controllers/issue_categories_controller.rb @@ -22,16 +22,16 @@ class IssueCategoriesController < ApplicationController def edit if request.post? and @category.update_attributes(params[:category]) flash[:notice] = l(:notice_successful_update) - redirect_to :controller => 'projects', :action => 'settings', :id => @project + redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project end end def destroy @category.destroy - redirect_to :controller => 'projects', :action => 'settings', :id => @project
+ redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
rescue
flash[:notice] = "Categorie can't be deleted" - redirect_to :controller => 'projects', :action => 'settings', :id => @project
+ redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
end
private
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index f595f2cf6..089a18e6a 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -16,21 +16,21 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class MembersController < ApplicationController - layout 'base'
- before_filter :find_project, :authorize
+ layout 'base'
+ before_filter :find_project, :authorize
- def edit - if request.post? and @member.update_attributes(params[:member]) - flash[:notice] = l(:notice_successful_update) - redirect_to :controller => 'projects', :action => 'settings', :id => @project
- end - end - - def destroy - @member.destroy
+ def edit + if request.post? and @member.update_attributes(params[:member])
+ flash[:notice] = l(:notice_successful_update) + redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project
+ end + end +
+ def destroy + @member.destroy
flash[:notice] = l(:notice_successful_delete) - redirect_to :controller => 'projects', :action => 'settings', :id => @project - end
+ redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project + end
private
def find_project
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3979d7f64..48b4be205 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -138,7 +138,7 @@ class ProjectsController < ApplicationController @issue_category = @project.issue_categories.build(params[:issue_category])
if @issue_category.save
flash[:notice] = l(:notice_successful_create)
- redirect_to :action => 'settings', :id => @project
+ redirect_to :action => 'settings', :tab => 'categories', :id => @project
else
settings
render :action => 'settings'
@@ -151,7 +151,7 @@ class ProjectsController < ApplicationController @version = @project.versions.build(params[:version])
if request.post? and @version.save
flash[:notice] = l(:notice_successful_create)
- redirect_to :action => 'settings', :id => @project
+ redirect_to :action => 'settings', :tab => 'versions', :id => @project
end
end
@@ -161,7 +161,7 @@ class ProjectsController < ApplicationController if request.post?
if @member.save
flash[:notice] = l(:notice_successful_create)
- redirect_to :action => 'settings', :id => @project
+ redirect_to :action => 'settings', :tab => 'members', :id => @project
else
settings
render :action => 'settings'
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 5c2dcc7f6..f5fd4e233 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -22,16 +22,16 @@ class VersionsController < ApplicationController def edit if request.post? and @version.update_attributes(params[:version]) flash[:notice] = l(:notice_successful_update) - redirect_to :controller => 'projects', :action => 'settings', :id => @project + redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project end end def destroy
@version.destroy - redirect_to :controller => 'projects', :action => 'settings', :id => @project
+ redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
rescue
flash[:notice] = "Unable to delete version"
- redirect_to :controller => 'projects', :action => 'settings', :id => @project
+ redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
end
def download
|