Commit Graph

2285 Commits

Author SHA1 Message Date
Clark Wang a9cc1c38df Allow hasOne relation to have a scope option
Signed-off-by: Clark Wang <clark.wangs@gmail.com>
2014-11-20 19:27:04 +08:00
Clark Wang 973dd33d63 fix skipping async validator will always fail if condition is un-fulfilled
If the validator configured with `{async:true}` option and `if/unless`
condition, validator should be skipped when the condition is un-fulfilled,
so the validator should be pass.

But currently, when skipping the validator, it calls `done(true)` which
accepts a `fail` flag as a param, this will fail the entire validation.

Signed-off-by: Clark Wang <clark.wangs@gmail.com>
2014-11-19 21:50:08 +08:00
Raymond Feng 293d904bf0 Merge tag 'v2.11.0'
2.11.0
2014-11-13 12:58:35 -08:00
Raymond Feng 59ca63cbe0 Merge branch 'release/2.11.0' into production 2014-11-13 12:58:28 -08:00
Raymond Feng 7e69d7c691 Bump version 2014-11-13 12:57:35 -08:00
Raymond Feng 9c575a3902 Merge branch 'BuddyHOPP-fix/350-create-batch-hasmany-relation' 2014-11-13 12:56:38 -08:00
Raymond Feng ba29669e0d Merge branch 'fix/350-create-batch-hasmany-relation' of github.com:BuddyHOPP/loopback-datasource-juggler into BuddyHOPP-fix/350-create-batch-hasmany-relation 2014-11-13 12:50:21 -08:00
Raymond Feng 13d08d83cc Merge pull request #352 from TorchlightSoftware/fix-create-rel
handle relationship create with [array]
2014-11-13 09:29:27 -08:00
bitmage d11eacffc6 handle relationship create with [array] 2014-11-11 14:48:34 -07:00
Alex Voitau 5c2468c4ef #350: Creating a batch via hasMany relation is failing. Added handling of array argument. 2014-11-07 18:01:18 -08:00
Alex Voitau f1638e9e4c #350: Creating a batch via hasMany relation is failing. Added context 'with scope' to allow individual execution of tests. 2014-11-07 15:21:15 -08:00
Raymond Feng c1af74dac5 Merge tag 'v2.10.3'
2.10.3
2014-11-04 22:12:01 -08:00
Raymond Feng c0cc347aa7 Merge branch 'release/2.10.3' into production 2014-11-04 22:11:55 -08:00
Raymond Feng c43783f78c Bump version 2014-11-04 22:11:12 -08:00
Raymond Feng a109b00c42 Merge pull request #349 from strongloop/feature/fix-multiple-includes
Add support for multiple includes that use relation syntax
2014-11-04 22:09:51 -08:00
Raymond Feng 14dcfb61be Add support for multiple includes that use relation syntax 2014-11-04 20:45:25 -08:00
Raymond Feng 5cd9e88ab2 Merge pull request #334 from pandaiolo/fix/has-one-pk
Fix for HasOne relation with non-standard id
2014-10-30 14:26:13 -07:00
Raymond Feng 11963ea12a Merge pull request #338 from fabien/fix/fields-vs-defaults
Don't apply defaults when fields are specified
2014-10-30 14:11:51 -07:00
Pandaiolo 833c24a2a3 Tests for non standard id - hasOne and polymorphic 2014-10-29 12:06:05 +01:00
Pandaiolo 9eaeb9e399 Fix HasOne PK on modelFrom instead of modelTo 2014-10-29 12:06:05 +01:00
Rand McKinney 0f0a9282b0 Remove "Suite" 2014-10-23 14:04:53 -07:00
Raymond Feng 4d101cae9e Merge tag 'v2.10.2'
2.10.2
2014-10-21 13:17:06 -07:00
Raymond Feng fd308362b9 Merge branch 'release/2.10.2' into production 2014-10-21 13:17:00 -07:00
Raymond Feng 354b843bf0 Bump version 2014-10-21 10:58:32 -07:00
Raymond Feng 5eed64db90 Merge pull request #332 from strongloop/feature/fix-memory-automigrate
Fix the automigrate issue
2014-10-21 08:58:11 -07:00
Fabien Franzen 4e20128945 Tiny fix: default __persisted to false 2014-10-19 18:52:18 +02:00
Fabien Franzen e7a108efdb Don't apply defaults when fields are specified 2014-10-19 18:47:27 +02:00
Raymond Feng 455743167a Fix the automigrate issue
See https://github.com/strongloop/loopback-example-relations-basic/issues/6
2014-10-16 12:04:16 -07:00
Raymond Feng 6fd8fe481a Merge tag 'v2.10.1'
2.10.1
2014-10-15 09:20:29 -07:00
Raymond Feng 4a339522e3 Merge branch 'release/2.10.1' into production 2014-10-15 09:20:22 -07:00
Raymond Feng 0335d0a7b9 Bump version 2014-10-15 09:19:36 -07:00
Fabien Franzen 5662d9f0c2 Merge pull request #329 from fabien/feature/include-scope
Enable include scope for belongsTo
2014-10-15 18:08:42 +02:00
Fabien Franzen ded292d79a Merge pull request #327 from fabien/fix/call-scope-method
Call relation methods in the right context
2014-10-15 18:08:10 +02:00
Fabien Franzen 55d116ec3f Enable include scope for belongsTo 2014-10-14 22:47:59 +02:00
Raymond Feng e93b5d761b Merge tag 'v2.10.0'
2.10.0
2014-10-13 16:10:28 -07:00
Raymond Feng 9807f2dbb7 Merge branch 'release/2.10.0' into production 2014-10-13 16:10:17 -07:00
Raymond Feng f2ed39cb2d Bump version 2014-10-13 08:34:24 -07:00
Raymond Feng 07993d2e1f Merge pull request #324 from fabien/feature/include-scope
Include scope
2014-10-13 08:33:26 -07:00
Fabien Franzen 58a6c924b3 Call relation methods in the right context
Before this change, it was impossible to override 'build' and other
(custom) relation/scope methods; only the original prototype method was
ever called.
2014-10-12 22:00:13 +02:00
Miroslav Bajtoš d69b515c29 Merge pull request #323 from strongloop/feature/do-not-inherit-base-model-option
Don't inherit settings.base when extending a model
2014-10-10 19:52:43 +02:00
Miroslav Bajtoš 14d178bf69 Don't inherit settings.base when extending a model
Fix the bug in `ModelClass.extend` where the `base` option used
in the new class was inherited from ModelClass. As a result
the extended model was incorrectly based on ModelClass's parent.

Modify `modelBuilder.define` to normalize the property name storing
the name of the base model to `settings.base`.
2014-10-10 18:35:18 +02:00
Fabien Franzen 8d6e3adaab Allow include syntax without scope param 2014-10-10 17:17:36 +02:00
Fabien Franzen 771d9505cc Allow 'rel' and 'relation' 2014-10-10 14:33:26 +02:00
Fabien Franzen 0c28ccedac Refactored inclusion
The syntax is now consistent, regardless of using [] or {} for the
include param.
2014-10-10 14:24:25 +02:00
Fabien Franzen ca0b3399c8 Implement include scopes 2014-10-10 12:28:39 +02:00
Raymond Feng 0859fc4c21 Merge pull request #296 from fabien/feature/default-scope
Default scope
2014-10-09 16:10:48 -07:00
Fabien Franzen 2838158139 Fix failing test 2014-10-09 18:18:04 +02:00
Fabien Franzen 0e49dc94ec Allow `attributes` as an alias for `properties` (for LDL) 2014-10-09 18:14:04 +02:00
Fabien Franzen ec05d0b5a8 Cleanup, consistency: allow properties to be a function
Also, pass along the current instance, for any instance method as a
context (save, updateAttributes).
2014-10-09 18:14:04 +02:00
Fabien Franzen beeb7c46c9 applyProperties => properties (object/false) 2014-10-09 18:14:04 +02:00