Commit Graph

508 Commits

Author SHA1 Message Date
Robbie Averill
7fdfe234fd
Merge pull request #260 from creative-commoners/pulls/3.1/many-many-reordering-fix
NEW Add support for ManyManyThrough relations
2018-07-02 09:59:51 +12:00
Guy Marriott
838e8d765e
Merge pull request #265 from creative-commoners/pulls/3.1/travis-recipes
Add various recipe versions to Travis build matrix
2018-06-28 13:42:03 +12:00
Dylan Wagstaff
b6130c4e11 Add unit tests for new ManyManyThrough support
The previous commit (9fa9ef89) added support for the new SilverStripe 4
feature of Many Many relationships through an intermediary object. After
much head scratching and community testing, the solution was proven to
work, however had no automated tests to confirm as such. This commit
rectifies that by testing both versioned and unversioned DataObjects in
a many_many through style relationship. Some minor tidy and comments
were also added as per feedback on the functionality code changes.
2018-06-26 14:41:39 +12:00
Robbie Averill
688c29ba04 Add various recipe versions to Travis build matrix 2018-06-25 14:16:05 +12:00
Robbie Averill
5b14abb221
Merge pull request #264 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:45:47 +12:00
Dylan Wagstaff
939415a444 Add supported module badge to readme 2018-06-15 17:53:40 +12:00
Robbie Averill
19b4c6a7fa
Merge pull request #263 from DrMartinGonzo/patch-2
Fix "+" icon in add new inline button
2018-06-13 09:57:45 +12:00
Martin Portevin
41f6267c23 Fix "+" icon in add new inline button 2018-06-13 09:51:21 +12:00
Dylan Wagstaff
9fa9ef8903 NEW Add support for ManyManyThrough relations
Previously relationships defiend as many_many came in a special type
of RelationList - however now this can be one of two types of
RelationList depending on the type of definition, with both being
valid many_many relationships.

This had the unfortunate side effect of seeing the OrderableRows
component in (the least) cease functioning correctly. No longer.

This also has the fortunate bonus of allowing a many_many relationship to
be versioned; where previously while each item in the relationship could
be versioned, the relationship itself could not.
2018-06-01 16:23:00 +12:00
Robbie Averill
e898711add
Merge pull request #255 from n8-sd/feature/allow_onAfterReorderItems_sortedIDs
Allow onAfterreorderItems extra variables.
2018-05-11 15:33:18 +12:00
Daniel Hensby
ba0d23ab5e
Merge pull request #256 from silverstripe-terraformers/feature/reorder_fix_versioned 2018-04-27 11:55:57 +01:00
Mojmir Fendek
6b47b6d63a Corrected a case when sort column is located in a table that belongs to ancestor class of the item. 2018-04-27 10:00:34 +12:00
Nathan SD
e15f1766bf Allow onAfterreorderItems extra variables. 2018-04-24 14:25:13 +12:00
Robbie Averill
b93a8f28ac
Merge pull request #250 from deracs/master
Can't reorder many many versioned classes
2018-03-06 16:14:22 +13:00
Michael Goldsmith
9009a83ae1 Revert back to previous version check to allow many many version objects to pass through the non-ORM method 2018-03-06 14:45:29 +13:00
Daniel Hensby
8e24be2660
Merge pull request #248 from silverstripe-terraformers/bugfix-update-preview-on-reorder
Update CMS preview when re-ordering rows
2018-02-27 10:09:00 +00:00
Bernard Hamlin
e7825cd0a3 Update CMS preview when re-ordering rows 2018-02-27 16:13:06 +13:00
Daniel Hensby
cbffc5b935
Merge branch '3' 2018-02-21 13:30:39 +00:00
Daniel Hensby
8c82965e7e
Merge branch '2' into 3 2018-02-21 13:28:13 +00:00
Daniel Hensby
96af48a2fe
Merge branch '3.1' into 3 2018-02-21 11:55:43 +00:00
Daniel Hensby
0974e36d57
Merge branch '3.0' into 3.1 2018-02-21 11:49:19 +00:00
Daniel Hensby
51dd4cab65
Merge branch '2.0' into 3.0 2018-02-21 11:25:09 +00:00
Daniel Hensby
30ae7e4037
Merge branch '2.0' into 2 2018-02-21 09:25:13 +00:00
Daniel Hensby
5945ce105f
Merge branch '1.5' into 2.0 2018-02-21 09:24:30 +00:00
Daniel Hensby
e20ead2624
Merge branch '1.4' into 1.5 2018-02-21 09:23:34 +00:00
Robbie Averill
e2bfcd1d9f Merge branch '2.0' into 2 2018-02-21 16:23:28 +13:00
Robbie Averill
b192551f30 Merge branch '3' 2018-02-12 11:13:37 +13:00
Robbie Averill
ed51125b91 Merge branch '3.1' into 3 2018-02-12 11:12:12 +13:00
Priyashantha
6d8b41ee5a Fixed GridFieldOrderableRows issue when data class is Versioned and relation is has_many (#243)
* Fixed GridFieldOrderableRows issue when data class is Versioned and relation is has_many

* just compare table names rather than updating existing getSortTable() func
2018-02-12 11:08:47 +13:00
Robbie Averill
37a206cf46
Merge pull request #244 from zanderwar/patch-1
Added installation instruction
2018-02-11 14:43:22 +13:00
Reece Alexander
9d4c87f5c7
Added installation instruction 2018-02-11 05:48:09 +10:00
Priyashantha
d1021ace51 Fixed GridFieldOrderableRows issue when data class is Versioned and relation is has_many (#243)
* Fixed GridFieldOrderableRows issue when data class is Versioned and relation is has_many

* just compare table names rather than updating existing getSortTable() func
2018-01-30 20:40:59 +00:00
Daniel Hensby
509abf1532
Merge pull request #233 from silverstripe-terraformers/feature/SS4_upgrade_fixes 2018-01-26 16:34:31 +00:00
Daniel Hensby
64b6fd04f3
Merge pull request #238 from creative-commoners/pulls/3.1/fix-searchbutton
FIX Update GridFieldAddExistinSearchButton and dialog to use Bootstrap classes
2018-01-26 16:31:31 +00:00
Daniel Hensby
4955b9c4b9
Merge pull request #239 from creative-commoners/pulls/3.1/add-7.2
Add PHP 7.2 to Travis build matrix, add individual phpcs ruleset
2018-01-26 13:48:10 +00:00
Daniel Hensby
6ef71280d1
Merge pull request #240 from creative-commoners/pulls/3.1/add-new-multi-class-width
FIX Remove excessive width on add new multi class dropdown
2018-01-26 13:47:15 +00:00
Robbie Averill
cd1fdada5d FIX Remove excessive width on add new multi class dropdown
This removes a width definition added in da2e75f
2018-01-26 14:05:16 +13:00
Robbie Averill
24db0da047 Fix PSR-2 rule violations and incorrect docblock return type 2018-01-26 13:40:06 +13:00
Robbie Averill
b29db7a4e7 Add PHP 7.2 to Travis build matrix, add individual phpcs ruleset 2018-01-26 13:37:44 +13:00
Robbie Averill
6bf1a05975 Update branch alias for 4.x-dev 2018-01-26 12:06:49 +13:00
Robbie Averill
8e8c1db7bf Merge branch '3' 2018-01-26 12:06:24 +13:00
Robbie Averill
e67065a780 Update branch alias for 3.2.x-dev 2018-01-26 12:05:25 +13:00
Martin Portevin
af0f342c3b Fix stopPropagation on click if no GridFieldEditableColumns
stopPropagation shouldn't fire if no GridFieldEditableColumns was added. It forces user to click on edit button on the far right instead of directly being able to click anywhere on the row.
2018-01-26 12:02:29 +13:00
Robbie Averill
978fda31d4
Merge pull request #129 from helpfulrobot/add-standard-code-of-conduct-file
Added standard code of conduct file
2018-01-26 11:55:52 +13:00
Robbie Averill
f540f247bb
Merge pull request #235 from DrMartinGonzo/patch-1
Fix stopPropagation on click if no GridFieldEditableColumns
2018-01-26 11:54:36 +13:00
Robbie Averill
eb9093a3ac Update translations 2018-01-26 11:53:55 +13:00
Robbie Averill
0a16566471 FIX Convert broken add-existing-search-form styles to use Bootstrap lists and pagination 2018-01-26 11:53:40 +13:00
Robbie Averill
8ba5c3435e FIX Switch Add Existing from jQuery UI to use Bootstrap styles 2018-01-26 11:01:24 +13:00
Robbie Averill
14c0080853 Update branch alias for 3.x-dev 2018-01-18 11:45:47 +13:00
Robbie Averill
eee01960e8 Merge branch '3.1' 2018-01-18 11:45:08 +13:00