From 35cf1e6258feefe4080ff23b3278c4934b66f97e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Feb 2007 18:14:43 +0000 Subject: [PATCH] only requested lists can be updated git-svn-id: http://redmine.rubyforge.org/svn/branches/work@270 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- mailing_lists/app/controllers/mailing_lists_controller.rb | 5 ++--- mailing_lists/app/views/projects/settings.rhtml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mailing_lists/app/controllers/mailing_lists_controller.rb b/mailing_lists/app/controllers/mailing_lists_controller.rb index d4d2bf7e0..53d441124 100644 --- a/mailing_lists/app/controllers/mailing_lists_controller.rb +++ b/mailing_lists/app/controllers/mailing_lists_controller.rb @@ -48,9 +48,8 @@ class MailingListsController < ApplicationController end end - def edit - @mailing_list = MailingList.find(params[:id]) - if request.post? and @mailing_list.update_attributes(params[:mailing_list]) + def edit + if request.post? && @mailing_list.status == MailingList::STATUS_REQUESTED && @mailing_list.update_attributes(params[:mailing_list]) flash[:notice] = l(:notice_successful_update) redirect_to :controller => 'projects', :action => 'settings', :tab => 'mailing-lists', :id => @project end diff --git a/mailing_lists/app/views/projects/settings.rhtml b/mailing_lists/app/views/projects/settings.rhtml index 338755de8..c0083da53 100644 --- a/mailing_lists/app/views/projects/settings.rhtml +++ b/mailing_lists/app/views/projects/settings.rhtml @@ -70,7 +70,7 @@ <%=h mailing_list.description %> <%= mailing_list.admin.name if mailing_list.admin %> <%= l(mailing_list.status_name) if mailing_list.status_name %> - <%= link_to_if_authorized(l(:button_edit), {:controller => 'mailing_lists', :action => 'edit', :id => mailing_list}, :class => 'icon icon-edit') %> + <%= link_to_if_authorized(l(:button_edit), {:controller => 'mailing_lists', :action => 'edit', :id => mailing_list}, :class => 'icon icon-edit') if mailing_list.status==MailingList::STATUS_REQUESTED %> <%= link_to_if_authorized(l(:button_delete), {:controller => 'mailing_lists', :action => 'destroy', :id => mailing_list}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del') unless mailing_list.status==MailingList::STATUS_TO_BE_DELETED %> <% end; reset_cycle %>