ish_manager 0.1.8.20 → 0.1.8.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/ish_manager/reports_controller.rb +5 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6397016c614d5c21d05d363637e82acedf46be31
|
|
4
|
+
data.tar.gz: db623739218c25f138e002a4d6b89dfed8f12fd2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d938bd5884995b632c6df2398f91831125bd1a715e37828eabc2e86b09327f854e639408cdb613758482f8721669f0778accb4f22841e5863dd538aa4bdecb5f
|
|
7
|
+
data.tar.gz: 6b69929120f6a47eb3c34505c355d162bd0bec381dc4657bb2f25777f2a2daa8459233274fec370854b5bf320c8038c1a81a63c217cfa3f211c8d7d0ff30585b
|
|
@@ -5,7 +5,10 @@ class IshManager::ReportsController < IshManager::ApplicationController
|
|
|
5
5
|
|
|
6
6
|
def index
|
|
7
7
|
authorize! :index, Report
|
|
8
|
-
@reports = Report.unscoped.order_by( :created_at => :desc
|
|
8
|
+
@reports = Report.unscoped.order_by( :created_at => :desc
|
|
9
|
+
).where( :is_trash => false
|
|
10
|
+
).page( params[:reports_page]
|
|
11
|
+
).per( Report::PER_PAGE )
|
|
9
12
|
if false === params[:site]
|
|
10
13
|
@reports = @reports.where( :site_id => nil )
|
|
11
14
|
end
|
|
@@ -118,7 +121,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
|
|
|
118
121
|
if @report.is_public
|
|
119
122
|
n = Newsitem.new
|
|
120
123
|
n.report = @report
|
|
121
|
-
n.descr = @report.
|
|
124
|
+
n.descr = @report.subhead
|
|
122
125
|
# n.user = @report.user
|
|
123
126
|
@site.newsitems << n
|
|
124
127
|
@site.touch
|