nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2016-02-23 09:38:53 +01:00
commit d9e3f3a734
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Changelog.md
View file

@ -129,9 +129,10 @@ Contributions are very welcome, the hard work is done!
## Bug fixes
* Fix empty name field when editing aspect names [#6706](https://github.com/diaspora/diaspora/pull/6706)
* Fix internal server error when trying to log out of an expired session [#6707](https://github.com/diaspora/diaspora/pull/6707)
* Only mark unread notifications as read [#6711](https://github.com/diaspora/diaspora/pull/6711)
## Features
* Added the footer to conversation pages
* Added the footer to conversation pages [#6710](https://github.com/diaspora/diaspora/pull/6710)
# 0.5.7.0

7
app/controllers/notifications_controller.rb
View file

@ -61,9 +61,9 @@ class NotificationsController < ApplicationController
def read_all
current_type = Notification.types[params[:type]]
notifications = Notification.where(:recipient_id => current_user.id)
notifications = notifications.where(:type => current_type) if params[:type]
notifications.update_all(:unread => false)
notifications = Notification.where(recipient_id: current_user.id, unread: true)
notifications = notifications.where(type: current_type) if params[:type]
notifications.update_all(unread: false)
respond_to do |format|
if current_user.unread_notifications.count > 0
format.html { redirect_to notifications_path }
@ -75,7 +75,6 @@ class NotificationsController < ApplicationController
format.xml { render :xml => {}.to_xml }
format.json { render :json => {}.to_json }
end
end
end