muck-activities 3.2.1 → 3.2.2
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/helpers/muck_activity_helper.rb +1 -1
- data/muck-activities.gemspec +8 -8
- metadata +14 -16
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.2.
|
1
|
+
3.2.2
|
@@ -111,7 +111,7 @@ module MuckActivityHelper
|
|
111
111
|
|
112
112
|
def get_profile_activities(activities_object)
|
113
113
|
if !params[:latest_activity_id].blank?
|
114
|
-
activities_object.activities.by_latest.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).is_public.created_by(activities_object).
|
114
|
+
activities_object.activities.by_latest.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).is_public.created_by(activities_object).includes(:comments).paginate(:page => @page, :per_page => @per_page)
|
115
115
|
else
|
116
116
|
activities_object.activities.by_latest.filter_by_template(params[:activity_filter]).is_public.created_by(activities_object).includes(:comments).paginate(:page => @page, :per_page => @per_page)
|
117
117
|
end
|
data/muck-activities.gemspec
CHANGED
@@ -4,14 +4,14 @@
|
|
4
4
|
# -*- encoding: utf-8 -*-
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
|
-
s.name =
|
8
|
-
s.version = "3.2.
|
7
|
+
s.name = "muck-activities"
|
8
|
+
s.version = "3.2.2"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Justin Ball", "Joel Duffin"]
|
12
|
-
s.date =
|
13
|
-
s.description =
|
14
|
-
s.email =
|
12
|
+
s.date = "2011-10-31"
|
13
|
+
s.description = "Activity engine for the muck system."
|
14
|
+
s.email = "justin@tatemae.com"
|
15
15
|
s.extra_rdoc_files = [
|
16
16
|
"README.rdoc"
|
17
17
|
]
|
@@ -2240,10 +2240,10 @@ Gem::Specification.new do |s|
|
|
2240
2240
|
"test/spec/spec_helper.rb",
|
2241
2241
|
"test/test/fixtures/rails.png"
|
2242
2242
|
]
|
2243
|
-
s.homepage =
|
2243
|
+
s.homepage = "http://github.com/tatemae/muck-activities"
|
2244
2244
|
s.require_paths = ["lib"]
|
2245
|
-
s.rubygems_version =
|
2246
|
-
s.summary =
|
2245
|
+
s.rubygems_version = "1.8.10"
|
2246
|
+
s.summary = "Activity engine for the muck system"
|
2247
2247
|
|
2248
2248
|
if s.respond_to? :specification_version then
|
2249
2249
|
s.specification_version = 3
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: muck-activities
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 11
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 3
|
8
8
|
- 2
|
9
|
-
-
|
10
|
-
version: 3.2.
|
9
|
+
- 2
|
10
|
+
version: 3.2.2
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Justin Ball
|
@@ -16,12 +16,10 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2011-
|
20
|
-
default_executable:
|
19
|
+
date: 2011-10-31 00:00:00 Z
|
21
20
|
dependencies:
|
22
21
|
- !ruby/object:Gem::Dependency
|
23
|
-
|
24
|
-
requirement: &id001 !ruby/object:Gem::Requirement
|
22
|
+
version_requirements: &id001 !ruby/object:Gem::Requirement
|
25
23
|
none: false
|
26
24
|
requirements:
|
27
25
|
- - ">="
|
@@ -31,11 +29,11 @@ dependencies:
|
|
31
29
|
- 0
|
32
30
|
version: "0"
|
33
31
|
name: muck-engine
|
34
|
-
version_requirements: *id001
|
35
32
|
prerelease: false
|
36
|
-
- !ruby/object:Gem::Dependency
|
37
33
|
type: :runtime
|
38
|
-
requirement:
|
34
|
+
requirement: *id001
|
35
|
+
- !ruby/object:Gem::Dependency
|
36
|
+
version_requirements: &id002 !ruby/object:Gem::Requirement
|
39
37
|
none: false
|
40
38
|
requirements:
|
41
39
|
- - ">="
|
@@ -45,11 +43,11 @@ dependencies:
|
|
45
43
|
- 0
|
46
44
|
version: "0"
|
47
45
|
name: muck-users
|
48
|
-
version_requirements: *id002
|
49
46
|
prerelease: false
|
50
|
-
- !ruby/object:Gem::Dependency
|
51
47
|
type: :runtime
|
52
|
-
requirement:
|
48
|
+
requirement: *id002
|
49
|
+
- !ruby/object:Gem::Dependency
|
50
|
+
version_requirements: &id003 !ruby/object:Gem::Requirement
|
53
51
|
none: false
|
54
52
|
requirements:
|
55
53
|
- - ">="
|
@@ -59,8 +57,9 @@ dependencies:
|
|
59
57
|
- 0
|
60
58
|
version: "0"
|
61
59
|
name: muck-comments
|
62
|
-
version_requirements: *id003
|
63
60
|
prerelease: false
|
61
|
+
type: :runtime
|
62
|
+
requirement: *id003
|
64
63
|
description: Activity engine for the muck system.
|
65
64
|
email: justin@tatemae.com
|
66
65
|
executables: []
|
@@ -2293,7 +2292,6 @@ files:
|
|
2293
2292
|
- test/spec/models/user_spec.rb
|
2294
2293
|
- test/spec/spec_helper.rb
|
2295
2294
|
- test/test/fixtures/rails.png
|
2296
|
-
has_rdoc: true
|
2297
2295
|
homepage: http://github.com/tatemae/muck-activities
|
2298
2296
|
licenses: []
|
2299
2297
|
|
@@ -2323,7 +2321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
2323
2321
|
requirements: []
|
2324
2322
|
|
2325
2323
|
rubyforge_project:
|
2326
|
-
rubygems_version: 1.
|
2324
|
+
rubygems_version: 1.8.10
|
2327
2325
|
signing_key:
|
2328
2326
|
specification_version: 3
|
2329
2327
|
summary: Activity engine for the muck system
|