File tree 1 file changed +16
-5
lines changed
1 file changed +16
-5
lines changed Original file line number Diff line number Diff line change @@ -107,12 +107,23 @@ def moment_params
107
107
end
108
108
109
109
def set_association_variables!
110
- @categories = current_user . categories . is_visible
111
- . or ( Category . where ( id : @moment . category_ids ) )
112
- . order ( created_at : :desc )
110
+ visible_categories = current_user . categories . is_visible
111
+ extra_categories = Category . where ( id : @moment . category_ids )
112
+
113
+ @categories = Category . where ( id : visible_categories . select ( :id ) )
114
+ . or ( extra_categories )
115
+ . includes ( :moments_categories )
116
+ . order ( created_at : :desc )
117
+
113
118
@category = Category . new
114
- @moods = current_user . moods . is_visible . or ( Mood . where ( id : @moment . mood_ids ) )
115
- . order ( created_at : :desc )
119
+ visible_moods = current_user . moods . is_visible
120
+ extra_moods = Mood . where ( id : @moment . mood_ids )
121
+
122
+ @moods = Mood . where ( id : visible_moods . select ( :id ) )
123
+ . or ( extra_moods )
124
+ . includes ( :moments_moods )
125
+ . order ( created_at : :desc )
126
+
116
127
@mood = Mood . new
117
128
@strategies = associated_strategies
118
129
@strategy = Strategy . new
You can’t perform that action at this time.
0 commit comments