61 Commits

Author SHA1 Message Date
google-labs-jules[bot]
0f4803392d Add seed source to Seed model (#4186)
* Add seed source to Seed model

* Update _form.html.haml

* Add to schema

* Default option

* Default option

* Fix test

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
2025-09-01 21:47:31 +09:30
Daniel O'Connor
0289786891 Seeds for trade - avoid showing expired seeds on homepage. (#4176)
* Improve date visibility

* Ensure when seeding seeds, it's false

* Typo
2025-08-31 14:39:42 +09:30
google-labs-jules[bot]
d383c8e2e4 Add filtering for tradeable seeds (#4111)
* feat: Add filtering for tradeable seeds

This change introduces a new feature to filter seeds based on their tradeability.

- Adds a link on the homepage to view all tradeable seeds.
- Modifies the seeds controller to support filtering by `tradeable_to`, allowing multiple values to be selected.
- Adds links to the seeds index page to filter by the various `tradeable_to` values.

* Update index.html.haml

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
2025-08-10 15:44:01 +09:30
Daniel O'Connor
3738d7cc21 Seeds > Photos - Fix tests not running and fix tests (#3621)
* Rename, so it runs in CI

* Fix specs slightly

* Fix tests
2024-02-04 15:05:43 +10:30
Daniel O'Connor
4310a6f717 DEPRECATION WARNING: TimeWithZone#to_s(:number) is deprecated. Please use TimeWithZone#to_fs(:number) instead. 2022-11-07 22:27:45 +10:30
Daniel O'Connor
302483f66d DEPRECATION WARNING: TimeWithZone#to_s(:number) is deprecated. Please use TimeWithZone#to_fs(:number) instead. 2022-11-07 22:26:57 +10:30
Daniel O'Connor
b24b9f82e6 Rubocop - auto corrections 2022-11-06 16:34:36 +10:30
Brenda Wallace
c6988e2189 Re-instate the plantings quick actions 2020-01-05 21:31:51 +13:00
Brenda Wallace
4a2bb2342c Sorting out cancancan, copied to common parent controller 2019-12-24 11:38:30 +13:00
Brenda Wallace
6f950e685b hand loading back to cancancan 2019-12-24 10:45:02 +13:00
codefactor-io
f8916dfecb [CodeFactor] Apply fixes 2019-12-20 04:16:33 +00:00
Brenda Wallace
9d68ab0228 Rubocop fix of controller 2019-12-20 17:13:54 +13:00
codefactor-io
d95bc774a2 [CodeFactor] Apply fixes 2019-12-20 03:22:04 +00:00
Brenda Wallace
8789fee365 Seeds into elastic search 2019-12-20 16:20:52 +13:00
Brenda Wallace
c0103a3f42 find seeds by slug 2019-12-20 09:21:47 +13:00
Brenda Wallace
5e5cdf6246 Fixing up lookup by slug 2019-12-19 21:49:18 +13:00
Brenda Wallace
b214f7ad8d linking existing plantings to their parent seeds 2019-11-01 02:23:14 +00:00
Brenda Wallace
b0c8b11246 📝 Inline editing and display tidy ups (#2200)
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
Brenda Wallace
7b87f8e4db Add flash messages to controllers 2019-07-09 09:19:27 +12:00
Brenda Wallace
e7b0b6f18e Remove table display on plantings#show, replace with boxes 2019-03-27 21:04:56 +13:00
Brenda Wallace
b35d13d5e5 Update seeds_controller.rb 2019-01-18 20:05:41 +13:00
Brenda Wallace
061bd31220 Use owner param in filename 2019-01-06 08:45:42 +13:00
Brenda Wallace
1e6c204df2 Rubcop fix up 2019-01-06 08:45:42 +13:00
Brenda Wallace
1e266a92f6 Members slug used in rotes 2019-01-06 08:45:42 +13:00
Brenda Wallace
387200abf7 Moving garden data under members 2019-01-06 08:45:42 +13:00
Brenda Wallace
f9d4e1d6ae Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
2018-03-12 08:39:32 +13:00
Brenda Wallace
3aa2f0bd3b Paginate photos on seeds#show (inc feature specs) 2017-12-17 08:55:08 +13:00
Brenda Wallace
a6a7f789a3 Rubocop upgrade (and some style fixes) 2017-12-01 21:07:39 +13:00
Brenda Wallace
48f8085e2d Fix seeds order 2017-11-29 20:59:37 +13:00
Brenda Wallace
0446c0a405 Add ordering back into controller #index 2017-11-29 20:59:37 +13:00
Brenda Wallace
5d654175a9 A bunch of single line methods 2017-05-29 16:17:43 +12:00
pozorvlak
3ac4fbcdb8 Merge branch 'dev' into seeds-controller 2017-02-20 13:36:50 +00:00
Brenda Wallace
035b2399ca DRY seeds controller 2017-02-20 20:54:06 +13:00
Brenda Wallace
e184503caa Fix up to match rubocop's MultilineMethodCallBraceLayout recommendation 2017-02-19 16:17:03 +13:00
Shiny
e574ee166c Merge branch 'dev' into bw/seeds-controller-complexity 2017-02-03 20:32:29 +13:00
Brenda Wallace
355419b6cb Reduce complexity of seeds controller 2017-02-02 00:01:48 +00:00
Brenda Wallace
4f465d808c We don't need to load the resource again 2016-12-07 23:54:03 +00:00
Brenda Wallace
03cb4a8dee use find_or_initialize_by 2016-12-02 00:23:46 +00:00
Brenda Wallace
07c135eeb5 before_filter is now before_action 2016-11-26 17:20:13 +13:00
Brenda Wallace
bcdd2a9167 Changed called to rails dynamic find_by 2016-11-26 15:55:38 +13:00
Brenda Wallace
723ebff923 Spacing fixes 2016-11-26 12:13:17 +13:00
Brenda Wallace
d268d2b09e Fixed indentation on comments 2016-11-26 11:45:25 +13:00
pozorvlak
a8961c3466 Revert "Show concern" 2016-06-08 12:58:32 +01:00
Mackenzie Morgan
8648db5518 create SimpleShow concern for models where show's json call is simple 2016-05-25 13:37:01 -04:00
Daniel O'Connor
4b4e0cf69a $ rubocop --only HashSyntax --auto-correct
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
Miles Gould
233f9dfd88 Split "days until maturity" into min and max fields. 2015-01-26 19:20:33 +00:00
Miles Gould
b56237115e Add form and controller for new seed properties 2015-01-24 12:01:11 +00: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