From 47b80c3a5b8f81522cd4a0ed32903dd9f144ed43 Mon Sep 17 00:00:00 2001
From: sidharth <bansal.sidharth2996@gmail.com>
Date: Sat, 12 Jan 2019 18:53:18 +0530
Subject: [PATCH 1/5] Multiple tag controller action accepts lists also now

---
 app/controllers/subscription_controller.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/controllers/subscription_controller.rb b/app/controllers/subscription_controller.rb
index 05c56aac7e..0c58649373 100644
--- a/app/controllers/subscription_controller.rb
+++ b/app/controllers/subscription_controller.rb
@@ -122,8 +122,13 @@ def multiple_add
     unless params[:names]
       flash[:notice] = "Please enter tags for subscription in the url."
       redirect_to "/subscriptions" + "?_=" + Time.now.to_i.to_s
+      return
+    end
+    if params[:names].is_a? String
+      tag_list = params[:names].split(',')
+    else
+      tag_list = params[:names]
     end
-    tag_list = params[:names].split(',')
     # should be logged in to subscribe
     if current_user
       # assume tag, for now
@@ -170,8 +175,8 @@ def multiple_add
         # user or node subscription
       end
     else
-      flash[:warning] = "You must be logged in to subscribe for email updates."
-      redirect_to "/login"
+      flash[:warning] = "You must be logged in to subscribe for email updates!"
+      redirect_to "/login?return_to=" + request.fullpath
     end
   end
 

From 889652df4550b0c64384e88c0e47359438ff9da3 Mon Sep 17 00:00:00 2001
From: sidharth <bansal.sidharth2996@gmail.com>
Date: Sat, 12 Jan 2019 18:58:08 +0530
Subject: [PATCH 2/5] Few minor changes

---
 app/views/tag/_tags.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/tag/_tags.html.erb b/app/views/tag/_tags.html.erb
index 44c9ba2ce5..4aff9fdcdd 100644
--- a/app/views/tag/_tags.html.erb
+++ b/app/views/tag/_tags.html.erb
@@ -1,7 +1,6 @@
 <ul class= "list-inline">
   <% tags.each do |tag| %>
     <% if tag.class == NodeTag %>
-
       <% if power_tag ^ tag.name.include?(':') # XOR operator??? %>
         <li><span id="tag_<%= tag.tid %>" class="label <%= label_name %>" style="cursor:pointer" data-toggle="popover" data-trigger="focus" data-count=0 data-placement="top" data-content="<p style='text-align:center;'><a href='/tag/<%= tag.name %>'><%= Tag.tagged_node_count(tag.name) || 0 %> notes</a> - <a href='/contributors/<%= tag.name %>'><%= Tag.contributors(tag.name).count %> people <br></a></p> <p style='text-align:center;font-size:12px;'><%if tag.description %><%= tag.description %> |<% end %> created by <a href='/profile/<%= tag.try(:author).try(:username) %>'><%= tag.try(:author).try(:username) %></a> <%= time_ago_in_words(Time.at(tag.date)) %> ago </p> <div style='text-align:center;'><a href='/subscribe/tag/<%= tag.name %>' class='btn btn-primary'>Follow</a></div>" data-html="true" title="<%= tag.name %>">
           <%= tag.name %>

From b71d5ab955a20f73ffb05ed74e75d84885491edb Mon Sep 17 00:00:00 2001
From: sidharth <bansal.sidharth2996@gmail.com>
Date: Sat, 12 Jan 2019 18:59:16 +0530
Subject: [PATCH 3/5] routes modified

---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index b7d3d5cb23..d7b977b8f0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -87,7 +87,7 @@
   get 'subscriptions' => 'subscription#index'
   get 'subscriptions/digest' => 'subscription#digest'
   get 'subscribe/multiple/:type/:names' => 'subscription#multiple_add'
-  put 'subscribe/multiple/:type/:names' => 'subscription#multiple_add'
+  post 'subscribe/multiple/:type/:names' => 'subscription#multiple_add'
 
   get 'wiki/stale' => 'wiki#stale'
   get 'wiki/new' => 'wiki#new'

From 43a7e3600ac45b9ce571c4176d533fb6fe87cfcf Mon Sep 17 00:00:00 2001
From: sidharth <bansal.sidharth2996@gmail.com>
Date: Sat, 12 Jan 2019 20:01:07 +0530
Subject: [PATCH 4/5] User not logged in

---
 app/controllers/subscription_controller.rb      |  2 +-
 config/routes.rb                                |  3 ++-
 test/functional/subscription_controller_test.rb | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/controllers/subscription_controller.rb b/app/controllers/subscription_controller.rb
index 0c58649373..5a5e7fe611 100644
--- a/app/controllers/subscription_controller.rb
+++ b/app/controllers/subscription_controller.rb
@@ -119,7 +119,7 @@ def digest
   end
 
   def multiple_add
-    unless params[:names]
+    if !params[:names] || params[:names] == ''
       flash[:notice] = "Please enter tags for subscription in the url."
       redirect_to "/subscriptions" + "?_=" + Time.now.to_i.to_s
       return
diff --git a/config/routes.rb b/config/routes.rb
index d7b977b8f0..36ee1f12dc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,7 +88,8 @@
   get 'subscriptions/digest' => 'subscription#digest'
   get 'subscribe/multiple/:type/:names' => 'subscription#multiple_add'
   post 'subscribe/multiple/:type/:names' => 'subscription#multiple_add'
-
+  get 'subscribe/multiple/:type/' => 'subscription#multiple_add'
+  post 'subscribe/multiple/:type/' => 'subscription#multiple_add'
   get 'wiki/stale' => 'wiki#stale'
   get 'wiki/new' => 'wiki#new'
   get 'wiki/replace/:id' => 'wiki#replace'
diff --git a/test/functional/subscription_controller_test.rb b/test/functional/subscription_controller_test.rb
index 57c7148296..a316eaa2da 100644
--- a/test/functional/subscription_controller_test.rb
+++ b/test/functional/subscription_controller_test.rb
@@ -37,4 +37,18 @@ def setup
     assert users(:bob).following(:kites)
     assert users(:bob).following(:balloon)
   end
+
+  test 'should not subscribe to multiple tags in case of empty string' do
+    UserSession.create(users(:bob))
+    assert users(:bob).following(:awesome)
+    get :multiple_add, params: { type: 'tag', names: '' }
+    assert_response :redirect
+    assert_equal "Please enter tags for subscription in the url.", flash[:notice]
+  end
+
+  test 'user is not logged in and tries to subscribe multiple tags' do
+    get :multiple_add, params: { type: 'tag', names: 'kites,balloon' }
+    assert_redirected_to '/login?return_to=/subscribe/multiple/tag/kites,balloon'
+    assert_equal "You must be logged in to subscribe for email updates!", flash[:warning]
+  end
 end

From 6a52b9a0d52123b855e4d81b4eedbe5a7c3f43db Mon Sep 17 00:00:00 2001
From: sidharth <bansal.sidharth2996@gmail.com>
Date: Sat, 12 Jan 2019 20:15:53 +0530
Subject: [PATCH 5/5] minor change

---
 config/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 36ee1f12dc..e0b2099089 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,8 +88,8 @@
   get 'subscriptions/digest' => 'subscription#digest'
   get 'subscribe/multiple/:type/:names' => 'subscription#multiple_add'
   post 'subscribe/multiple/:type/:names' => 'subscription#multiple_add'
-  get 'subscribe/multiple/:type/' => 'subscription#multiple_add'
-  post 'subscribe/multiple/:type/' => 'subscription#multiple_add'
+  get 'subscribe/multiple/:type' => 'subscription#multiple_add'
+  post 'subscribe/multiple/:type' => 'subscription#multiple_add'
   get 'wiki/stale' => 'wiki#stale'
   get 'wiki/new' => 'wiki#new'
   get 'wiki/replace/:id' => 'wiki#replace'