tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-01 00:49:33 +02:00
Code Issues Projects Releases Wiki Activity
2,415 Commits 29 Branches 516 Tags 147 MiB
4965352bc3
Commit Graph

79 Commits

Author SHA1 Message Date
Sean Harvey
964c67e98b MINOR Fixed undefined index error on ComplexTableField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75781 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-30 22:48:21 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 00:07:39 +00:00
Ingo Schommer
4499d1a8d0 ENHANCEMENT Allowing item-specific permissions in TableListField and subclasses (through TableListField_Item->Can() and DataObject->can*() methods). Adding "disabled" icons to template. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73028 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-13 10:07:27 +00:00
Sam Minnee
08a5a7c387 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72803 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-10 22:08:52 +00:00
Andrew O'Neil
635e2c3df6 Merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72453 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-04 03:44:11 +00:00
Sean Harvey
df36ae07e8 ENHANCEMENT Allow getting extra field data for a many-to-many relation by calling getExtraData() on a ComponentSet and passing the component name, and child ID 
ENHANCEMENT Hooked up setting field values for many_many_extraFields into ComplexTableField. See r71613 for the original many-to-many auto setting addition
BUGFIX When editing an existing record, many-to-many auto setting wasn't being done because saveComplexTableField() is called on ComplexTableField_ItemRequest
 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71635 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-11 00:10:37 +00:00
Sean Harvey
fa4c42d642 ENHANCEMENT Allow auto setting a many-to-many relation on ComplexTableField in the similar fashion of auto setting the foreign key for a one-to-many or one-to-many relation. 
ENHANCEMENT Added DataObject::many_many_extraFields() for getting the many_many_extraFields fields for a component name on both sides of a many-to-many relation.
MINOR Added test for many_many_extraFields in DataObjectTest



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71613 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-10 06:04:36 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-01 23:49:53 +00:00
Ingo Schommer
b7d394008e MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69957 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-10 11:35:50 +00:00
Ingo Schommer
085346f0e0 MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69704 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 06:19:48 +00:00
Sam Minnee
a3d3fb65a9 Updated SQL queries to be ansi compatable 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66401 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-23 00:31:06 +00:00
Sam Minnee
b39d3811ff Refactored tabstrip.js to use livequery for loading 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65717 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-12 22:28:07 +00:00
Ingo Schommer
61a856503e BUGFIX Calling parent constructor in ComplexTableField_ItemRequest, was confusing RequestHandler 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-04 13:52:03 +00:00
Sean Harvey
99589e626f BUGFIX Fix potential PHP notice opening a ComplexTableField popup 
MINOR Code formatting in ComplexTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65127 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-03 02:33:08 +00:00
Sam Minnee
cd699e3d89 API CHANGE #2857 - Renamed RequestHandlingData to RequestHandler 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64953 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-30 22:03:21 +00:00
Hayden Smith
c004cc9b2f BUGFIX: Fixed incorrectly reverted methods related to sizing of the popup. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64604 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-21 21:42:27 +00:00
Ingo Schommer
3b16fe9b59 BUGFIX Fixed ComplexTableField->saveComplexTableField() success message object link - was assuming same context as ComplexTableField_ItemRequest 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64251 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-14 23:06:22 +00:00
Hayden Smith
f0af7dd9a5 Corrected reverted merge. ComplexTableField::setPopupSize is now present. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63882 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-08 19:22:07 +00:00
Sean Harvey
332da65edb MINOR Tidied up argument list for Object::create() in ComplexTableField->AddForm() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63815 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-08 02:40:10 +00:00
Ingo Schommer
e5d4bf6216 BUGFIX Disabled user_error in ComplexTableField->sourceID() when no formfield 'ID' is found in ComplexTableField->$detailFormFields - not strictly required as we can deduce it from the URL. It was causing conflicts with DataObject->scaffoldFormFields() not returning an 'ID' field 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63622 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-03 16:19:31 +00:00
Sam Minnee
7fbeb7d6c5 BUGFIX: Fixed ComplexTableField export 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63581 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-03 02:25:49 +00:00
Sean Harvey
2c773d0d69 MINOR phpdoc tweaks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63490 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-02 00:34:16 +00:00
Ingo Schommer
9371f4688b ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63154 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-27 16:02:38 +00:00
Sam Minnee
9f05546c1e Fixed bug with ComplexTableField inappropriately referencing a relation field that doesn't exist 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62998 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-24 05:24:51 +00:00
Sam Minnee
a47f5834a2 BUGFIX: Fixed bug introduced into AssetTableField by previous CTF change 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62909 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-23 03:15:49 +00:00
Sam Minnee
ed311db3bf ENHANCEMENT: ComplexTableFilters used to edit relations have their filter automatically set, as well as the foreign key on new records. 
API CHANGE: TableListField::sourceFilter() can be overloaded to change the querying logic.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62883 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-23 01:24:03 +00:00
Sam Minnee
0075040f87 API CHANGE: TableListField::ajax_refresh is deprecated. Removed all calls to it from the core, instead getting HTML fragments by visiting the field's URL. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61683 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-28 04:14:22 +00:00
Romain Louis
5689ec0caa MINOR setRelationAutoSetting function adding 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61217 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-20 22:47:46 +00:00
Sam Minnee
3fe588bbf5 Added ComplexTableField::getCustomFieldsFor() that you can overload in subclasses of ComplexTableField to create alternative pop-up forms 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60910 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-18 00:50:39 +00:00
Ingo Schommer
d38d7208b7 BUGFIX Fixed ScaffoldINGComplexTableField file name 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60756 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-14 07:12:25 +00:00
Hayden Smith
ea956432f9 Merged [47064]: Set 'show' as the default action for ComplexTableField. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60490 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 05:20:20 +00:00
Hayden Smith
1220f6d86d Merged [47039]: Introduces custom actions to TableListField and ComplexTableField. By default, the show, edit and delete actions are included. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60433 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 23:24:54 +00:00
Ingo Schommer
34479223fa MINOR Moved ScaffoldComplexTableField to separate file 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60401 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 05:41:00 +00:00
Ingo Schommer
2d8434a43f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60327 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 02:57:59 +00:00
Ingo Schommer
624540a2d0 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 02:25:44 +00:00
Ingo Schommer
bf9f349210 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60276 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 00:03:57 +00:00
Ingo Schommer
a1f37b93eb (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60258 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-10 22:49:59 +00:00
Ingo Schommer
4ec93162a0 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60231 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-09 06:29:50 +00:00
Ingo Schommer
0a8f2a67f6 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60228 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-09 06:18:32 +00:00
Ingo Schommer
8fd1a33d84 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60227 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-09 05:57:44 +00:00
Ingo Schommer
d6967f10f1 MINOR syntax error 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60217 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-09 05:08:13 +00:00
Ingo Schommer
016cff2093 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60209 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-09 04:38:44 +00:00
Ingo Schommer
b5776e0438 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-09 03:54:55 +00:00
Ingo Schommer
6bd5da7e6e (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60206 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-09 03:29:30 +00:00
Andrew O'Neil
b11956268e Merged revisions 54212 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r54212 | sminnee | 2008-05-09 11:12:34 +1200 (Fri, 09 May 2008) | 1 line
  
  #2447 - Bug in editing comment
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56902 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 03:48:00 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-15 13:33:53 +00:00
Romain Louis
eb018ad36a getParentIdNameRelation bug fixing and cleaning : This function is usefull only for the has_one and has_many relation but useless for many_many 
Morerover, it manages well now the child heritage and parent heritage

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53114 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-21 05:29:59 +00:00
Ingo Schommer
c35ae17168 #2310 MemberTableField Popup breaks after saving 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50947 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 09:24:59 +00:00
Ingo Schommer
c5d538c366 Merged revisions 50947 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r50947 | ischommer | 2008-03-12 21:53:28 +1300 (Wed, 12 Mar 2008) | 1 line
  
  BUGFIX properly setting $childID in form for newly created items to avoid duplicates after subsequent saving (the form reloaded without the ID connection)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50941 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 08:54:24 +00:00
Sam Minnee
9c1c5f5c2f Merged revisions 50903 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50903 | sminnee | 2008-03-11 17:29:06 +1300 (Tue, 11 Mar 2008) | 1 line
  
  #2302 - Fixed double-escaping of CTF popup page-navigation links
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50898 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 04:30:14 +00:00