Commit Graph

4522 Commits

Author SHA1 Message Date
Martina Simicic
905087ab8e Use positive statements 2020-01-07 21:31:48 +13:00
Martina Simicic
9aaa18c0d3 Show garden type for a garden 2020-01-07 21:31:48 +13:00
Brenda Wallace
bccdd6333e find the crop name from es result 2020-01-06 21:49:53 +13:00
Brenda Wallace
96f0866f39 rubocop fix up 2020-01-06 21:49:00 +13:00
Brenda Wallace
feab98e962 removing dead code 2020-01-05 21:41:16 +13:00
Brenda Wallace
c6988e2189 Re-instate the plantings quick actions 2020-01-05 21:31:51 +13:00
Brenda Wallace
b7e53daeba fixes to crop photos 2020-01-05 16:57:14 +13:00
Brenda Wallace
ebb8460e44 Merge branch 'dev' into cache/harvests 2020-01-05 16:56:47 +13:00
codefactor-io
7e30b6b6e0 [CodeFactor] Apply fixes 2020-01-03 11:28:51 +00:00
Martina Simicic
ba04c44742 Make garden type optional when editing garden 2020-01-03 09:50:33 +01:00
Brenda Wallace
f27ac12563 don't pass photos to crops/_photos 2020-01-02 20:29:41 +13:00
Brenda Wallace
ff883db279 Revert "displays photos without hitting the database"
This reverts commit 139574c9c0.
2020-01-02 20:23:13 +13:00
Brenda Wallace
6017c04b5f don't check if post is liked by member, unless the member is signed in 2020-01-01 15:54:52 +13:00
Brenda Wallace
139574c9c0 displays photos without hitting the database 2020-01-01 14:15:04 +13:00
Brenda Wallace
8a1b8be0ef Load crops from search, without hitting the database 2020-01-01 13:47:25 +13:00
Brenda Wallace
d46883f39b don't query for photos that we never read 2020-01-01 12:32:23 +13:00
Brenda Wallace
41c90acbbc added missing liked flag to photos/card 2020-01-01 11:43:59 +13:00
Brenda Wallace
6e81f2966d fixed colouring of likes button 2020-01-01 09:24:47 +13:00
Brenda Wallace
c4d02edbd1 force reindex after a like 2020-01-01 09:24:24 +13:00
Brenda Wallace
b2738afdc2 fake reindexer on posts, so it doesn't throw errors 2020-01-01 08:42:18 +13:00
Brenda Wallace
36875b620c harvest search, fixed error when some data not set on model 2020-01-01 08:41:00 +13:00
Brenda Wallace
80038c7f42 set which parts of crop are searchable 2020-01-01 08:40:43 +13:00
Brenda Wallace
63ea6752fa likes reading from hash from elastic 2020-01-01 08:40:04 +13:00
Brenda Wallace
de3c4d0f62 likes found in controller by id and type of likeable 2020-01-01 08:39:27 +13:00
Brenda Wallace
54778d9884 Likes popuplating from elastic, no more extra look ups 2020-01-01 08:38:27 +13:00
Brenda Wallace
f76266a716 photos controller working with ES 2019-12-31 21:46:42 +13:00
Brenda Wallace
676345815c tests for photos searching 2019-12-31 21:02:38 +13:00
Brenda Wallace
38c7bdd7c2 likes count and sorted es search data config 2019-12-30 09:51:10 +13:00
Brenda Wallace
4940b79043 more tidy, crops controller 2019-12-28 10:08:50 +13:00
Brenda Wallace
a89534da53 harvest tidy up 2019-12-28 10:06:10 +13:00
Brenda Wallace
97cacdae0e 2019-12-28 09:50:08 +13:00
Brenda Wallace
233c5666ad treat harvests as object(not hash) in harvsets rss feed 2019-12-28 09:33:53 +13:00
Brenda Wallace
b9e9ce1439 index seed.active into ES 2019-12-28 09:33:36 +13:00
Brenda Wallace
8ee332edd8 update harvests controller 2019-12-28 09:20:18 +13:00
Brenda Wallace
ce909332b7 plantings controller update 2019-12-28 09:15:52 +13:00
Brenda Wallace
979d172bd7 rubocop tidy on harvests rss feed 2019-12-28 09:06:23 +13:00
Brenda Wallace
0624184270 tidying up matching attributes for seeds rss feed 2019-12-28 09:06:13 +13:00
Brenda Wallace
59130d5603 display rss feed from harvests objects (instead of hashes) 2019-12-28 08:41:47 +13:00
Brenda Wallace
1c7816c951 fixing photos by crop query in photos controller 2019-12-27 17:20:28 +13:00
Brenda
460ff43a4e Adding more counter caches 2019-12-26 23:42:11 +00:00
Brenda
42e225469a Routes using slugs (instead of ids)
this seems to be intended by the models having slugs (added about 7 years ago) but the routes weren't using them
2019-12-26 23:30:23 +00:00
Brenda Wallace
ebdaaf0738 Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-27 09:04:56 +13:00
Brenda Wallace
c6d6c3cb5c fixed link in seed card 2019-12-27 09:04:51 +13:00
Brenda Wallace
2d7951d85f Update buttons_helper.rb 2019-12-27 00:15:05 +13:00
Brenda Wallace
6c7bd77764 Update photo_capable.rb 2019-12-27 00:14:05 +13:00
Brenda Wallace
f4b87672b1 Update _actions.html.haml 2019-12-27 00:11:46 +13:00
Brenda Wallace
fc152feebb Update _quick_actions.haml 2019-12-26 23:53:26 +13:00
Brenda Wallace
9e0f35b22b fixing plantings rss feed 2019-12-26 23:22:12 +13:00
Brenda Wallace
e3a789c15e indexed items matching database attributes 2019-12-26 23:15:38 +13:00
Brenda
9a704bacfc no counter cache on many to many association harvest->photos 2019-12-26 18:12:37 +13:00