Commit Graph
202 Commits
Author SHA1 Message Date
Taylor Griffin 28d29291a7 any member can create a crop at least provisionally 2015-01-31 10:03:44 +11:00
Taylor Griffin 253b5a3f85 define permitted param for nested attribute 2015-01-23 13:20:37 +11:00
Taylor Griffin 0e0c309c15 Revert "Sci names permitted params" 2015-01-23 11:42:42 +11:00
Taylor Griffin 3c360ab1b8 specify permitted params for nested attributes 2015-01-23 09:22:13 +11:00
Shiho Takagi f910fdfa73 use elasticsearch for auto-suggest 2015-01-20 13:20:13 +11:00
Shiho Takagi 99eb33ccbb clearning up the code 2015-01-18 12:23:54 +11:00
Shiho Takagi b4cd151a03 merge from upstream 2015-01-17 14:09:45 +11:00
Shiho Takagi ce265e281a cleaning up the code 2015-01-17 00:37:37 +11:00
Shiho Takagi 06c7703628 auto-suggest to use existing search 2015-01-17 00:31:01 +11:00
Shiho Takagi 556ba33172 updated crop search view 2015-01-17 00:09:39 +11:00
Shiho Takagi 9a3c4e69e8 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
Conflicts:
	app/models/crop.rb
2015-01-15 21:32:46 +11:00
Shiho Takagi 10e6e7c3cb Integrate Elasticsearch and implement crop search against scientific_name 2015-01-15 19:05:02 +11:00
Taylor Griffin 007f7112a7 replaced caching using observers with a key-based (and simplified) caching system 2014-12-19 21:17:43 +11:00
Taylor Griffin a35a573b2b update follow member code to be rails 4 compatible 2014-12-14 14:51:18 +11:00
Yoong Kang Lim 837121265a Reversed order of authorization and authentication. Also added tests 2014-12-09 21:27:16 +11:00
Yoong Kang Lim 81d1189203 Added a before_filter for any action that requires authentication. Will redirect to login page if not logged in 2014-11-24 22:12:42 +11:00
Taylor Griffin acbd3f9a9e implement strong parameters instead of protected attributes 2014-11-18 20:08:54 +11:00
Taylor Griffin 56b4f8a221 mimick old FriendlyId behavior when calling find on a model - therefore, Model.find not Model.friendly.find (this probably needs review) 2014-11-16 20:21:34 +11:00
Shiho Takagi 14d039ee01 Added crops-posts association as well as updated GUI for crop show 2014-10-05 13:32:08 +11:00
Taylor Griffin 2c50c3b703 merge in a bunch of (mostly bootstrap 3) changes 2014-08-29 07:14:44 +10:00
Marlena Compton 38b9207122 remove extra method 2014-08-21 20:11:10 -07:00
Marlena Compton ec25f2ab91 created list of crop wranglers on the crop wranglers page 2014-08-21 20:11:10 -07:00
Taylor Griffin e0d81f5693 improve and abstract auto_suggest api 2014-08-02 22:14:10 +10:00
Taylor Griffin 8a1dd9d171 implement autocomplete for crop name on new planting form 2014-07-26 20:16:22 +10:00
Skud d558353e4c Merge branch 'scinames' of github.com:Skud/growstuff into Skud-scinames
Conflicts:
	CONTRIBUTORS.md
2014-07-22 11:23:08 +10:00
Skud a0fc8802b2 Allow selection of crop display order (popularity or alphabetical)
Had some trouble with tests; apparently the counter_cache behaves
differently when it starts counting from 0, which meant that some tests
started failing unless you do @crop.reload to refresh the
plantings_count.  Weird, but oh well.
2014-07-18 18:37:47 +10:00
Skud 8223025d35 Set default plantings_count to 0 not nil 2014-07-18 18:06:43 +10:00
Skud 573e555bcf Added unpopular scope to crop 2014-07-18 17:52:11 +10:00
Taylor Griffin ded464ad4c removed call to for debugging 2014-07-13 18:00:46 +10:00
Taylor Griffin 8b45a1759c got scientific names working on the crop page but view tests are failing 2014-07-13 17:57:55 +10:00
Skud 3abaca3136 Tweak what's emitted as JSON
(let's just emit plantings for now, as that's all we're using)
2014-06-30 11:48:58 -07:00
Skud 2f8e060b49 added plantings, seeds, and harvests to the crops JSON 2014-06-30 10:56:58 -07:00
Skud 4ce071a0df Fixed a bug that was deleting crops from the database!
Best bug of the night. TIL: don't call delete on an activerecord
collection expecting it to act like an array. D'oh!
2014-01-03 22:47:18 +11:00
Skud 0a3ecdc5ad Added crop search controller and views 2014-01-03 22:29:44 +11:00
Skud 9cf770a200 Adjusted crops.rss to show most recent 2013-09-25 16:59:28 +10:00
Skud 92ebf1a43c Added harvest CSV 2013-09-25 16:02:40 +10:00
Skud 24255411c9 added dates created/modified to crops csv 2013-09-16 17:04:39 +10:00
Skud d014343667 A basic implementation of a CSV dump for crops 2013-09-16 15:33:34 +10:00
Skud 995f9b2d60 Display crop hierarchy (recursively!) 2013-09-02 12:01:58 +10:00
Skud 772eec77a7 added routes and controller stuff for crop hierarchy 2013-09-02 11:13:02 +10:00
Skud 4cdb571e27 Merge pull request #284 from Skud/wrangler-homepage
added a basic crop wrangler homepage
2013-08-21 21:54:04 -07:00
Skud 656edefb5f Eager loading for frequently-accessed/database-heavy pages 2013-08-22 10:18:33 +10:00
Skud 8f7becfa78 added a basic crop wrangler homepage 2013-08-21 21:24:22 +10:00
martyhines 098595721b Added crop creator to crop edit form 2013-08-20 21:46:22 -04:00
Skud 5d3a44ae0c cache stats and member thumbnails on homepage 2013-08-14 11:47:09 +10:00
Craig Read d563f0ceae Converting crops RSS to HAML
Added spec for crops RSS

Removed redundant @new_crops instance variable (not needed as we now
have pagination).
2013-05-24 12:22:41 +10:00
gnattery be1034a50d paginate crops 2013-03-20 14:50:16 +11:00
Skud cd469264bd this seems to mostly work 2013-02-01 11:21:13 +11:00
Skud ed2e73832d sorta kinda works, but login/homepage are b0rked 2013-02-01 11:10:12 +11:00
Miles Gould aac4839968 Update comments in controller classes.
They referred to (now nonexistent) .erb files - I've changed them to
refer to the corresponding .haml files.
2012-12-07 12:01:03 +00:00