Fix success notification upon clicking the follow button when user is…

… not signed in #6688 (#6703) * fix success notification on /tags * refactor condition for follow flash notice
publiclab · Nov 25, 2019 · 833e0b6 · 833e0b6
1 parent b28eafb
commit 833e0b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/assets/javascripts/async_tag_subscriptions.js b/app/assets/javascripts/async_tag_subscriptions.js
@@ -27,10 +27,12 @@ $(document).ready(function()
       $('.index-follow-buttons').on('ajax:success', function(data, status, xhr){
         console.log("Hello");
         var data_recv = JSON.parse(JSON.stringify(status));
-        notyNotification('relax', 3000, 'success', 'top', data_recv.message + 'Click <a href="../subscriptions"> here </a> to manage your subscriptions. ');
-        var html_new = '<a rel="tooltip" title=Following class="btn btn-default btn-sm active" href="/unsubscribe/tag/'+ data_recv.tagname + '"> <i class="fa fa-user-plus" aria-hidden="true"></i>Following</a>';
-        $('#follow-unfollow-column-'+data_recv.id).html(html_new);
-        window.history.pushState("", "", data_recv.url); // Preserve state
+        if(data_recv.id) {
+          notyNotification('relax', 3000, 'success', 'top', data_recv.message + 'Click <a href="../subscriptions"> here </a> to manage your subscriptions. ');
+          var html_new = '<a rel="tooltip" title=Following class="btn btn-default btn-sm active" href="/unsubscribe/tag/'+ data_recv.tagname + '"> <i class="fa fa-user-plus" aria-hidden="true"></i>Following</a>';
+          $('#follow-unfollow-column-'+data_recv.id).html(html_new);
+          window.history.pushState("", "", data_recv.url); // Preserve state
+        }
       });
       $('.index-follow-buttons').on('ajax:error', function(data, status, xhr){
         var data_recv = JSON.parse(JSON.stringify(status));

diff --git a/app/controllers/subscription_controller.rb b/app/controllers/subscription_controller.rb
@@ -66,7 +66,7 @@ def add
           if request.xhr?
             message = "Started following #{params[:name]}!"
             status = "200"
-            render json: { status: status, message: message, id: tag.tid, tagname: params[:name], url: "/tags" + "?_=" + Time.now.to_i.to_s }
+            render json: { status: status, message: message, id: tag.tid, tagname: params[:name], url: "/tags" + "?_=" + Time.now.to_i.to_s } if current_user
           else
             flash[:notice] = "You are now following '#{params[:name]}'."
             redirect_to "/subscriptions" + "?_=" + Time.now.to_i.to_s