Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
simple_controller
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
simple_controller
Commits
55d9501f
Commit
55d9501f
authored
Nov 10, 2021
by
liyijie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改ransak statistic
parent
223c176f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
base_controller.rb
lib/simple_controller/base_controller.rb
+7
-8
No files found.
lib/simple_controller/base_controller.rb
View file @
55d9501f
...
@@ -185,13 +185,7 @@ class SimpleController::BaseController < ::InheritedResources::Base
...
@@ -185,13 +185,7 @@ class SimpleController::BaseController < ::InheritedResources::Base
# 执行sub_q
# 执行sub_q
def
ransack_paginate
(
association
)
def
ransack_paginate
(
association
)
if
params
[
:group_keys
].
present?
if
params
[
:group_keys
].
present?
statistics_association
=
association
.
unscope
(
:order
).
distinct
@statistics
=
statistics_association
.
group
(
params
[
:group_keys
]).
count
.
merge
(
count:
statistics_association
.
count
)
if
defined?
(
Com
::
CounterStorage
)
&&
params
[
:group_keys
].
count
>
1
hash
=
statistics_association
.
group
(
params
[
:group_keys
]).
count
.
merge
(
count:
statistics_association
.
count
)
@statistics
=
Com
::
CounterStorage
.
load
(
params
[
:group_keys
],
hash
).
group_count
(
*
params
[
:group_keys
])
else
@statistics
=
statistics_association
.
group
(
params
[
:group_keys
]).
count
.
merge
(
count:
statistics_association
.
count
)
end
end
end
association
=
association
.
ransack
(
params
[
:q
]).
result
unless
self
.
class
.
instance_variable_get
(
:@ransack_off
)
||
params
[
:q
].
blank?
association
=
association
.
ransack
(
params
[
:q
]).
result
unless
self
.
class
.
instance_variable_get
(
:@ransack_off
)
||
params
[
:q
].
blank?
...
@@ -241,7 +235,12 @@ class SimpleController::BaseController < ::InheritedResources::Base
...
@@ -241,7 +235,12 @@ class SimpleController::BaseController < ::InheritedResources::Base
association
=
end_of_association_chain
association
=
end_of_association_chain
if
params
[
:group_keys
].
present?
if
params
[
:group_keys
].
present?
statistics_association
=
association
.
unscope
(
:order
).
distinct
statistics_association
=
association
.
unscope
(
:order
).
distinct
@statistics
=
statistics_association
.
group
(
params
[
:group_keys
]).
count
.
merge
(
count:
statistics_association
.
count
)
if
defined?
(
Com
::
CounterStorage
)
&&
params
[
:group_keys
].
count
>
1
hash
=
statistics_association
.
group
(
params
[
:group_keys
]).
count
.
merge
(
count:
statistics_association
.
count
)
@statistics
=
Com
::
CounterStorage
.
load
(
params
[
:group_keys
],
hash
).
group_count
(
*
params
[
:group_keys
])
else
@statistics
=
statistics_association
.
group
(
params
[
:group_keys
]).
count
.
merge
(
count:
statistics_association
.
count
)
end
end
end
association
=
association
.
ransack
(
params
[
:sub_q
]).
result
unless
self
.
class
.
instance_variable_get
(
:@ransack_off
)
||
params
[
:sub_q
].
blank?
association
=
association
.
ransack
(
params
[
:sub_q
]).
result
unless
self
.
class
.
instance_variable_get
(
:@ransack_off
)
||
params
[
:sub_q
].
blank?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment