bugfix: get broadcast num after logging in #90

Jiyuan-Yang · May 21, 2020 · f61773c · f61773c
1 parent 6c7c3de
commit f61773c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/broadcasts_controller.rb b/app/controllers/broadcasts_controller.rb
@@ -87,7 +87,6 @@ def destroy_all
     Broadcast.where(:to_id => user_id).each do |item|
       item.destroy
     end
-    update_broadcast_num
     redirect_to broadcasts_path
   end
 

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -81,8 +81,10 @@ def projects_data
   end
 
   def get_broadcast_num
-    user_id = User.find_by(gitlab_id: current_user.id).id
-    Broadcast.where(:to_id => user_id).length
+    if current_user.id
+      user_id = User.find_by(gitlab_id: current_user.id).id
+      Broadcast.where(:to_id => user_id).length
+    end
   end
 
   def ie_svg_meta_tag