tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
7,326 Commits 31 Branches 527 Tags 162 MiB
51fe1fa1ca
Commit Graph

155 Commits

Author SHA1 Message Date
Ingo Schommer
68ae667748 BUGFIX: Removed obsolete start argument from ComplexTableField_Item constructor. (from r98536) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102764 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-14 02:18:52 +00:00
Ingo Schommer
6848684334 MINOR: Initialise variables to fix unit test (from r95754) (from r98092) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102584 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 02:05:07 +00:00
Ingo Schommer
8ec4c25be7 MINOR: Don't try and access the ORM from ComplexTableField in situations where it shouldn't. (from r95544) (from r98089) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102581 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 02:01:59 +00:00
Ingo Schommer
c077c77c25 BUGFIX: Use Controller::join_links() for all TableListField and ComplexTableField link building, to support form URLs with querystrings. 
BUGFIX: If ComplexTableField::getParentRecord() can't find a record, just return null rather than erroring. (from r96555) (from r96649) (from r96775)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102407 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 03:27:03 +00:00
Ingo Schommer
89176afbc4 BUGFIX: Removed XSS holes (from r94823) (from r96773) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102402 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 03:21:00 +00:00
Ingo Schommer
5bcfbe6622 BUGFIX: Allow opening of the detail pop-ups of a record on a ComplexTableField attached to a deleted page. (from r94593) (from r96762) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102393 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 03:16:54 +00:00
Ingo Schommer
41c04fe61b MINOR Making parameter optional for ComplexTableField_Item 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99683 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-23 03:26:57 +00:00
Sean Harvey
b52e49dee7 BUGFIX ComplexTableField - fixed sprintf() not enough arguments when the referrer has a % character in it, the referrer is now an argument instead of being hardcoded in the string (from r95093) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95633 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 05:48:06 +00:00
Andrew Short
bc80c1eff3 MINOR: Made ComplexTableField sub-forms testable by returning rather than echoing results. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95035 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-13 05:22:33 +00:00
Andrew Short
1b66ce5a86 MINOR: Allow a validation error to be thrown when a DataObject is saved in ComplexTableField. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95034 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-13 05:22:32 +00:00
Ingo Schommer
f3db094874 BUGFIX Escaping sprintf() arguments in ComplexTableField to avoid extraneous % characters in a referrer URL messing up the sprintf() invocation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93745 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-27 01:22:21 +00:00
Will Rossiter
8855814b5a API CHANGE: removed deprecated ajax_render() method from CTF 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93679 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-26 22:38:44 +00:00
Ingo Schommer
dca8c0cb6f merging 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92557 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:33:06 +00:00
Ingo Schommer
1b138d6916 MINOR Removed layout_helpers.js dependency 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92516 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:30:42 +00:00
Ingo Schommer
a11db29672 MINOR Changed paths to moved thirdparty dependencies (mostly from /jsparty to /sapphire/thirdparty, /cms/javascript and /sapphire/javascript) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92502 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:29:59 +00:00
Ingo Schommer
a099f7906f MINOR Added ComplexTableField::setController() which makes testing useful for switching between controllers (from r92134) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92459 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 01:43:33 +00:00
Sam Minnee
dfd45fb7fd BUGFIX: Fixed diabled image references for edit and delete links in CTF (from r88967) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89206 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:39:19 +00:00
Sam Minnee
5ec83b9bd0 BUGFIX: Fixed resolution of amibiguous has_many foreign keys in ComplexTableField to use the same logic as DataObject (from r88945) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89203 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:38:57 +00:00
Andrew Short
f29eceecff API CHANGE #3724: Unified the Link() method to accept an action parameter. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88495 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:16 +00:00
Sean Harvey
82a68dd3bd MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81997 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-16 03:44:15 +00:00
Ingo Schommer
da758f9f6e ENHANCEMENT Using try/catch blocks in ComplexTableField->saveComplexTableField() to catch any ValidationExceptions and terminate the saving process 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78255 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-02 06:12:10 +00:00
Sean Harvey
60c5570bf8 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77817 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-26 02:19:50 +00:00
Sean Harvey
0f237b0c57 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77141 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-19 02:44:58 +00:00
Sean Harvey
b20b6e0f95 Merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76269 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-06 06:36:16 +00:00
Sean Harvey
f4eecd4d0d Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75903 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-04 01:20:12 +00:00
Sean Harvey
9b75cb1987 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75845 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:49:34 +00:00
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
Sam Minnee
05dc1eee2c Merged revisions 50683 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50683 | aoneil | 2008-03-07 11:05:27 +1300 (Fri, 07 Mar 2008) | 2 lines
  
  #2295 - DataObjectSets cannot be iterated over multiple times concurrently
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50871 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:31:43 +00:00
Sam Minnee
a0be727cc3 Merged revisions 50488 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50488 | sminnee | 2008-03-03 21:59:09 +1300 (Mon, 03 Mar 2008) | 1 line
  
  #2280 - Fixed XML parsing errors in CTF
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50870 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:31:38 +00:00
Andrew O'Neil
89f2c50e51 fix caching in complex table field 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49440 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-12 20:51:59 +00:00
Andrew O'Neil
664e6899f8 fix sql error on comments section 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48963 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-01 02:33:42 +00:00
Ingo Schommer
d28faae514 updating form in ctf-popup after saving (including validation-errors and fields that have may changed on the serverside, e.g. ImageField) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48867 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-30 22:57:23 +00:00
Andrew O'Neil
3a0fd261ad Fix sorting in complextablefield 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48250 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-18 05:01:35 +00:00
Ingo Schommer
9a36047021 converted TODO into @todo for better PHPDocumentor support 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47884 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-11 01:49:50 +00:00
Sam Minnee
41a11b277e Improved API documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47799 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 00:34:18 +00:00
Sam Minnee
b1d2e3906b API Documentation updates 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-09 04:18:36 +00:00
Ingo Schommer
071b310c64 fixed getParentIdName() call in DetailForm() - paramter-order was wrong 
better checking in saveComplexTableField() to avoid PHP-notice

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47740 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 21:57:15 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags 
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 06:37:50 +00:00
Ingo Schommer
0535f628ff added $popupClass to avoid duplication, getting basedataclass for existing children in DetailForm() (in case we're dealing with different subclasses) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47585 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-03 08:43:26 +00:00
Ingo Schommer
623ab42539 added setParentIdName() for really manual setting of the relation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46318 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-04 04:54:26 +00:00
Andrew O'Neil
dd85ba1141 Add an element sets the relation with the parent automatically but this functionnality needs to be unset for the HasManyComplexTablefield (merged from branches 2.2.0, r45135) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46094 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:27:34 +00:00
Andrew O'Neil
a66d6ad93c http://trac/silverstripe/changeset/45480/open/modules/sapphire/trunk/forms/ComplexTableField.php - revert 402 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45570 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-25 09:55:13 +00:00
Normann Lou
26b8f7dffe switch externals to trunk. 
Inform-merge: from the changeset:
r32477: Merge 2.0-inform from trunk previously
r32478: Merge 2.0-inform from trunk previously
r32481: merge 2.0infom with lastes chunk 
r32483: merge 2.0infom with lastes chunk 
r33526: Final styling of all forms and combined communication form add/alter javascript for height adjustment of First / Second block 
r33580: styling for combined form communication in myinfom pages 
r33706: styling of combined form (communication) in Email 
r33881: made compatible to $extraClass 
r33885: added defaultVal
r33887: fixed typo 
r34728: modified SmallFieldHolder?()
r34729: added "validationError"-class 
r34914: WIP3866: Factfinder: Hide "self emplyed" block 
r34964: Change current plan upto TraumaInsurance? 
r35038: disabled friggin field focus 
r35230: #1032 Fixed hash-link insertion 
r35887: conditionally setting parameters in sourceID() - to avoid empty overrides
r35892: Saving value in SQL-compatible format (YYYY-MM-DD instead of DD/MM/YYYY), with fallback for non-sql values (just passed through without conversion) 
r35928: Removed "create a" from PageType?-dropdown, sorting alphabetically, falling back to $singular_name
r35990: branched off for membertablefield
r35994: fix for membertablefield
r36024: added array-condition needed for DMYDateField 
r36083: fix bug for compositeField -> dropDatalessField
r36394: removed debug code 
r36826: change wrong indent format 
r36828: WIP 4262: Logging out of My Inform goes to blank page
r36858: Fixed error caused in r12472 while merging to Session-class
r37132: Merged partial changesets from branches/2.0-nzct, only adding childID to detailform when not in add-mode 
r40815: add an unsubscribe record when a member subscribe a newslettertype 
r41113: fix the bug described in http://support.silverstripe.com/info/ticket/31: CRM not showing search results
r43226: fixed search (partial merge from trunk) 
r43268: merged createNewPassword() from trunk, was referencing a non-existinent global function randomString()


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45473 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-23 01:10:19 +00:00
Romain Louis
8a244ce72a cms_right style added to popup 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44436 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 04:16:05 +00:00
Andrew O'Neil
68e9570c8d Rename pagination() to Pagination() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44242 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-05 01:38:25 +00:00
Jeremy Shipman
4c76be62c9 Reverting typography changes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44162 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-02 03:01:40 +00:00
Andrew O'Neil
3b0e6ba71f #120 - ComplexTableField popup 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44161 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-02 02:53:53 +00:00
Jeremy Shipman
943c892548 added cms_typography.css to replace typography.css in the cms, as it confusues with front end typography.css 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44156 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-02 02:14:20 +00:00
Ingo Schommer
1e332e6dbe !!BUGFIX: Refactored CSS and Requirements: Created more specific css-files to reduce side-effects and ease debugging, moved generic form-styling from cms/css/cms_*.css into sapphire/css/Form.css. 
!!BUGFIX: Ordered Requirement-inclusions in CMSMain/LeftAndMain to be more coherent (avoiding duplicate Requirement-calls)
ENHANCEMENT: Removed some css-rules disabled by comments
ENHANCEMENT: coding-conventions (see r42726)
FEATURE: Added Profile-page with LeftAndMain->myprofile()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42728 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-27 20:56:55 +00:00
Ingo Schommer
71f9ac0c10 mlanthaler: Bugfix: Added isset() to prevent E_NOTICE error. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41952 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 21:36:17 +00:00
Ingo Schommer
a377a67e54 mlanthaler: Switched to an authenticator and a form class to be able to add other authentication methods. (merged from branches/gsoc) 
mlanthaler: The missing authenticator base class...  (merged from branches/gsocmlanthaler: Switched to an authenticator and a form class to be able to add other authentication methods.  (merged from branches/gsoc)
mlanthaler: The missing authenticator base class...  (merged from branches/gsoc))


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41729 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 03:12:21 +00:00