OSDN Git Service
(root)
/
elecoma
/
elecoma.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
246d250
)
DEFAULT_IDをチェックしてるところを修正
author
Taro Matsuzawa
<tmatsuzawa@kbmj.com>
Fri, 2 Apr 2010 09:45:09 +0000
(18:45 +0900)
committer
Taro Matsuzawa
<tmatsuzawa@kbmj.com>
Fri, 2 Apr 2010 09:45:09 +0000
(18:45 +0900)
app/controllers/admin/totals_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/admin/totals_controller.rb
b/app/controllers/admin/totals_controller.rb
index
3aff012
..
c47bb10
100644
(file)
--- a/
app/controllers/admin/totals_controller.rb
+++ b/
app/controllers/admin/totals_controller.rb
@@
-11,7
+11,7
@@
class Admin::TotalsController < Admin::BaseController
params[:search][key] = parse_date_select(params[:search], key)
end
params[:search][:retailer_id] ||= session[:admin_user].retailer_id
- if
session[:admin_user].retailer_id != Retailer::DEFAULT_ID
&& params[:search][:retailer_id] != session[:admin_user].retailer_id
+ if
!session[:admin_user].master_shop?
&& params[:search][:retailer_id] != session[:admin_user].retailer_id
raise ActiveRecord::RecordNotFound
end
@search = OpenStruct.new(params[:search])