Luis Ramos
f54abbd376
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
8a61257547
Rename all before_filter to before_action, it's the same function with a new name
2020-06-22 13:11:57 +01:00
Luis Ramos
7e12142f91
Collection must be after load_data so that hubs are already available for VOs calculation
2020-04-28 16:31:11 +01:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
Luis Ramos
a049e7a433
Add product to includes to avoid N+1 queries to fetch products when VO authorization is done right after this
2020-04-03 14:48:06 +01:00
Luis Ramos
e64d573337
Revert accidental push of a byebug statement with the direct translations push to master 🙈
2020-04-03 12:06:39 +01:00
Luis Ramos
7858a26e5e
Update all locales with the latest Transifex translations
2020-04-03 12:03:40 +01:00
Luis Ramos
a261ae118d
Add missing permitted attributes to variant overrides controller
2020-03-21 19:14:26 +00:00
Luis Ramos
7320b38b93
Add missing attributes to variant override controller
2020-03-21 19:14:26 +00:00
Luis Ramos
0151b5ee9a
Permit extra needed params in variant overrides controller
2020-03-21 19:14:26 +00:00
Luis Ramos
5b37e89738
Handle strong params in variant_overrides_controller
...
We use a simpler way to permit on array within params here and change products_controller to the same style
2020-03-21 19:14:26 +00:00
Matt-Yorkley
df1299b290
Fix user not yet loaded in prepend_before_filter
2020-02-22 11:06:51 +00:00
Matt-Yorkley
c0ecdb9e3a
Fix deprecated #includes in join without reference
...
DEPRECATION WARNING: It looks like you are eager loading table(s) (one of: variant_overrides, enterprises, enterprise_roles) that are referenced in a string SQL snippet. For example:
Post.includes(:comments).where("comments.title = 'foo'")
Currently, Active Record recognizes the table in the string, and knows to JOIN the comments table to the query, rather than loading comments in a separate query. However, doing this without writing a full-blown SQL parser is inherently flawed. Since we don't want to write an SQL parser, we are removing this functionality. From now on, you must explicitly tell Active Record when you are referencing a table from a string:
Post.includes(:comments).where("comments.title = 'foo'").references(:comments)
If you don't rely on implicit join references you can disable the feature entirely by setting `config.active_record.disable_implicit_join_references = true`. (called from collection at /home/user/Github/openfoodnetwork/app/controllers/admin/variant_overrides_controller.rb:77)
2020-02-22 11:06:51 +00:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
luisramos0
340cbe5947
Eager load variants with variant overrides to avoid n+1 in the following line
2019-05-02 11:10:53 +01:00
luisramos0
a68b5eaf22
Fix bug in Variant Overrides controller. It was validating authorization for variant overrides of deleted variants
2019-04-17 15:31:19 +01:00
niko
f65d3c2815
fix rubocop issue
2018-10-04 03:30:32 +02:00
niko
3ae38178a3
Move query from variant_overrides_controller to its model scope
2018-10-04 02:43:02 +02:00
Matt-Yorkley
91521dc2b0
Improve import_date queries
2018-05-26 19:34:20 +01:00
Matt-Yorkley
d9c720e89a
Tidy up import_date
2018-05-26 19:34:20 +01:00
Matt-Yorkley
c2c42e1d9a
Product Import refactor
2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ed49d397e
Refactor PI
2018-05-26 19:34:20 +01:00
Matt-Yorkley
3a6f316ede
Codeclimate refactor
2018-05-26 19:34:20 +01:00
Matt-Yorkley
b3c906b3a4
Product Import v3 with asynchronous processing
...
Fixed spec
Quick spec tweak
2018-05-26 19:34:19 +01:00
Matt-Yorkley
ffbb67d480
PI inventories additions
2018-05-26 19:34:19 +01:00
Rob Harrington
7bb58342fc
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
2017-06-23 16:49:08 +10:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Rob Harrington
669642292b
Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub
2016-01-15 09:07:51 +11:00
Rob Harrington
0bbae19b41
Variant Overrides Index: User can manually reset inheritance
2016-01-15 09:07:51 +11:00
Steve Pettitt
25454d3e97
Added new fields to fix VO deletion feature specs
2016-01-15 09:07:49 +11:00
Rob Harrington
94785d4157
Fixing authorization for VariantOverridesController#bulk_reset
2016-01-15 09:07:49 +11:00
Rob Harrington
d01da727f0
Removing :bulk_update action from actions allowed on nil object, using collection_actions methods on controller instead
2016-01-15 09:07:49 +11:00
Steve Pettitt
0ee078e232
Added toggle to enable/disable reset stock. Updated specs
2016-01-15 09:07:48 +11:00
Steve Pettitt
2921958788
Variant override controller spec added
2016-01-15 09:07:48 +11:00
Steve Pettitt
34c603a9c3
Added angular service tests for variant overrides stock reset
2016-01-15 09:07:48 +11:00
Rob Harrington
53d97dab08
WIP: Adding view and routes for resetting variant_overrides count_on_hand
2016-01-15 09:07:48 +11:00
Rob Harrington
d8c4e292c8
Adding method for determining variant override hubs
2015-03-27 16:09:45 +11:00
Rohan Mitchell
5609354136
Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs
2015-03-13 10:45:38 +11:00
Rob Harrington
85b8adb1aa
call to order_cycle_hub_enterprises has no arguments
2015-03-01 15:33:16 +11:00
Rohan Mitchell
fce7714994
Load correct set of variant override producers, use variant_override_enterprises_per_hub, tighten specs
2015-02-04 11:20:08 +11:00
Rohan Mitchell
84b607433c
Creating and then updating the new override updates the same override instead of creating a duplicate
2014-12-12 13:33:14 +11:00
Rohan Mitchell
c38686c820
Create new variant overrides
2014-12-12 13:33:14 +11:00
Rohan Mitchell
531b35bbc6
WIP: Extract variant overrides to own controller - route, controller, views
2014-12-12 13:33:14 +11:00
