zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-10 06:34:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into refactor-messages

Browse source 
# Conflicts:
#	app/controllers/epp/polls_controller.rb
#	test/fixtures/messages.yml
#	test/integration/epp/poll_test.rb
#	test/models/message_test.rb
This commit is contained in:
Artur Beljajev 2018-09-17 13:30:25 +03:00
commit 52feefeb79
3 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/epp/polls_controller.rb
View file

@ -9,7 +9,7 @@ class Epp::PollsController < EppController
private
def req_poll
@notification = current_user.unread_notifications.last
@notification = current_user.unread_notifications.order('created_at DESC').take
render_epp_response 'epp/poll/poll_no_messages' and return unless @notification
if @notification.attached_obj_type && @notification.attached_obj_id