FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change logic for deletion when no user or no question is found

This commit is contained in:
pixeldesu 2015-07-17 22:31:10 +02:00
parent 0044430fa6
commit 19d6ccd855
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/inbox_controller.rb
View File

@ -17,6 +17,7 @@ class InboxController < ApplicationController
.where(questions: { user_id: @target_user.id, author_is_anonymous: false }) .where(questions: { user_id: @target_user.id, author_is_anonymous: false })
.count .count
if @inbox_author.empty? if @inbox_author.empty?
@empty = true
flash.now[:info] = "No questions from @#{params[:author]} found, showing default entries instead!" flash.now[:info] = "No questions from @#{params[:author]} found, showing default entries instead!"
else else
@inbox = @inbox_author @inbox = @inbox_author
@ -28,7 +29,15 @@ class InboxController < ApplicationController
end end
end end
@disabled = true if @inbox.empty? or @not_found if @empty or @not_found
@delete_id = "ib-delete-all"
elsif @author
@delete_id = "ib-delete-all-author"
else
@delete_id = "ib-delete-all"
end
@disabled = true if @inbox.empty?
respond_to do |format| respond_to do |format|
format.html format.html
format.js format.js

2
app/views/inbox/_sidebar.html.haml
View File

@ -25,5 +25,5 @@
.panel-heading .panel-heading
%h3.panel-title= t 'views.inbox.sidebar.actions.title' %h3.panel-title= t 'views.inbox.sidebar.actions.title'
.panel-body .panel-body
%button.btn.btn-block.btn-danger{type: :button, id: @author ? 'ib-delete-all-author' : 'ib-delete-all', disabled: (@disabled ? 'disabled' : nil), data: { ib_count: @inbox_count }}= t 'views.inbox.sidebar.actions.button' %button.btn.btn-block.btn-danger{type: :button, id: @delete_id , disabled: (@disabled ? 'disabled' : nil), data: { ib_count: @inbox_count }}= t 'views.inbox.sidebar.actions.button'