proposals_discussion: display an error when trying to create a proposal without a topic

Victor Costa
1 parent 55e057ab
Showing 4 changed files with 56 additions and 41 deletions Show diff stats
controllers/myprofile/proposals_discussion_plugin_myprofile_controller.rb
test/functional/proposals_discussion_plugin_myprofile_controller_test.rb
views/proposals_discussion_plugin_myprofile/select_topic.html.erb
views/select_topic.html.erb
 class ProposalsDiscussionPluginMyprofileController < MyProfileController
   before_filter :check_edit_permission_to_proposal, :only => :publish_proposal
+  before_filter :set_discussion, :only => [:select_topic, :new_proposal]
   def select_topic
-    @discussion = profile.articles.find(params[:parent_id])
-    render :file => 'select_topic'
   end
   def new_proposal
-    redirect_to :controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => params[:discussion][:topic]
+    if params[:discussion].blank? || params[:discussion][:topic].blank?
+      session[:notice] = _('Please select a topic')
+      render :file => 'proposals_discussion_plugin_myprofile/select_topic'
+    else
+      redirect_to :controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => params[:discussion][:topic]
+    end
   end
   def publish_proposal
@@ -27,4 +31,8 @@ class ProposalsDiscussionPluginMyprofileController &lt; MyProfileController
     render_access_denied unless @proposal.allow_edit?(user)
   end
+  def set_discussion
+    @discussion = profile.articles.find(params[:parent_id])
+  end
+
 end
@@ -24,7 +24,7 @@ class ProposalsDiscussionPluginMyprofileControllerTest &lt; ActionController::TestC
   end
   should 'new_proposal redirect to cms controller' do
-    get :new_proposal, :profile => profile.identifier, :discussion => {:topic => topic.id}
+    get :new_proposal, :profile => profile.identifier, :discussion => {:topic => topic.id}, :parent_id => discussion.id
     assert_redirected_to :controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => topic.id
   end
@@ -41,4 +41,9 @@ class ProposalsDiscussionPluginMyprofileControllerTest &lt; ActionController::TestC
     assert !proposal.reload.published
   end
+  should 'new_proposal without a topic redirect to back' do
+    get :new_proposal, :profile => profile.identifier, :parent_id => discussion.id
+    assert_template 'select_topic'
+  end
+
 end
@@ -0,0 +1,39 @@
+<script>
+  jQuery(document).ready(function($){
+    $("#topics").accordion();
+    $('#topics input[type=radio],label').on('click',function(e){e.stopPropagation();});
+    $('#topics h4').click(function(e){
+      e.stopPropagation();
+      $(this).find('input:radio').prop('checked', true);
+    });
+  });
+</script>
+
+<div class="proposals-discussion-plugin select-topic">
+  <h1><%= @discussion.title %></h1>
+  <%= form_for :discussion, :url => {:controller => 'proposals_discussion_plugin_myprofile', :action => 'new_proposal'} do %>
+
+    <h3><%= _('Select topic') %></h3>
+    <div id="topics">
+
+      <% @discussion.topics.each do |topic| %>
+        <h4>
+          <%= radio_button_tag('discussion[topic]', topic.id) %>
+          <%= topic.title %>
+        </h4>
+        <div class="content">
+          <%= topic.body %>
+        </div>
+      <% end %>
+
+      <div class="clear"></div>
+    </div>
+
+    <%= hidden_field_tag :parent_id, @discussion.id %>
+
+    <div class="actions">
+      <%= submit_button(:next, _('Next')) %>
+      <%= button :cancel, _('Cancel'), @discussion.view_url %>
+    </div>
+  <% end %>
+</div>
@@ -1,37 +0,0 @@
-<script>
-  jQuery(document).ready(function($){
-    $("#topics").accordion();
-    $('#topics input[type=radio],label').on('click',function(e){e.stopPropagation();});
-    $('#topics h4').click(function(e){
-      e.stopPropagation();
-      $(this).find('input:radio').prop('checked', true);
-    });
-  });
-</script>
-
-<div class="proposals-discussion-plugin select-topic">
-  <h1><%= @discussion.title %></h1>
-  <%= form_for :discussion, :url => {:controller => 'proposals_discussion_plugin_myprofile', :action => 'new_proposal'} do %>
-
-    <h3><%= _('Select topic') %></h3>
-    <div id="topics">
-
-      <% @discussion.topics.each do |topic| %>
-        <h4>
-          <%= radio_button_tag('discussion[topic]', topic.id) %>
-          <%= topic.title %>
-        </h4>
-        <div class="content">
-          <%= topic.body %>
-        </div>
-      <% end %>
-
-      <div class="clear"></div>
-    </div>
-
-    <div class="actions">
-      <%= submit_button(:next, _('Next')) %>
-      <%= button :cancel, _('Cancel'), @discussion.view_url %>
-    </div>
-  <% end %>
-</div>
@@ -0,0 +1,39 @@		@@ -0,0 +1,39 @@
	1	+<script>
	2	+ jQuery(document).ready(function($){
	3	+ $("#topics").accordion();
	4	+ $('#topics input[type=radio],label').on('click',function(e){e.stopPropagation();});
	5	+ $('#topics h4').click(function(e){
	6	+ e.stopPropagation();
	7	+ $(this).find('input:radio').prop('checked', true);
	8	+ });
	9	+ });
	10	+</script>
	11	+
	12	+<div class="proposals-discussion-plugin select-topic">
	13	+ <h1><%= @discussion.title %></h1>
	14	+ <%= form_for :discussion, :url => {:controller => 'proposals_discussion_plugin_myprofile', :action => 'new_proposal'} do %>
	15	+
	16	+ <h3><%= _('Select topic') %></h3>
	17	+ <div id="topics">
	18	+
	19	+ <% @discussion.topics.each do \|topic\| %>
	20	+ <h4>
	21	+ <%= radio_button_tag('discussion[topic]', topic.id) %>
	22	+ <%= topic.title %>
	23	+ </h4>
	24	+ <div class="content">
	25	+ <%= topic.body %>
	26	+ </div>
	27	+ <% end %>
	28	+
	29	+ <div class="clear"></div>
	30	+ </div>
	31	+
	32	+ <%= hidden_field_tag :parent_id, @discussion.id %>
	33	+
	34	+ <div class="actions">
	35	+ <%= submit_button(:next, _('Next')) %>
	36	+ <%= button :cancel, _('Cancel'), @discussion.view_url %>
	37	+ </div>
	38	+ <% end %>
	39	+</div>
	@@ -1,37 +0,0 @@	@@ -1,37 +0,0 @@
1	-<script>
2	- jQuery(document).ready(function($){
3	- $("#topics").accordion();
4	- $('#topics input[type=radio],label').on('click',function(e){e.stopPropagation();});
5	- $('#topics h4').click(function(e){
6	- e.stopPropagation();
7	- $(this).find('input:radio').prop('checked', true);
8	- });
9	- });
10	-</script>
11	-
12	-<div class="proposals-discussion-plugin select-topic">
13	- <h1><%= @discussion.title %></h1>
14	- <%= form_for :discussion, :url => {:controller => 'proposals_discussion_plugin_myprofile', :action => 'new_proposal'} do %>
15	-
16	- <h3><%= _('Select topic') %></h3>
17	- <div id="topics">
18	-
19	- <% @discussion.topics.each do \|topic\| %>
20	- <h4>
21	- <%= radio_button_tag('discussion[topic]', topic.id) %>
22	- <%= topic.title %>
23	- </h4>
24	- <div class="content">
25	- <%= topic.body %>
26	- </div>
27	- <% end %>
28	-
29	- <div class="clear"></div>
30	- </div>
31	-
32	- <div class="actions">
33	- <%= submit_button(:next, _('Next')) %>
34	- <%= button :cancel, _('Cancel'), @discussion.view_url %>
35	- </div>
36	- <% end %>
37	-</div>