Commit Graph

121 Commits

Author SHA1 Message Date
Sean Harvey
60f237092a BUGFIX #6299 TableListField::Link() includes $action value twice (thanks ajshort!) (from r115379)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115380 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-01-10 03:46:28 +00:00
Sam Minnee
38601b96f8 BUGFIX Fixed ComplexTableField and TableListField GET actions against CSRF attacks (with Form_SecurityToken->checkRequest()) (from r113276)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114529 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-05 08:26:03 +00:00
Sam Minnee
5c0b2182ae API CHANGE Added security token to TableListField->Link() in order to include it in all URL actions automatically. This ensures that field actions bypassing Form->httpSubmission() still get CSRF protection (from r113275)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-05 08:24:58 +00:00
Sam Minnee
3c6512ab1a MINOR Check in TableListField->HighlightClasses() (fixes #5993, thanks lx) (from r110837)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:36:39 +00:00
Ingo Schommer
80eab2a24c BUGFIX: Reverted 107414, wrong patch (from r107417)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112589 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:43:47 +00:00
Ingo Schommer
3b500bb137 BUGFIX: TableListField headings i18n translation (ticket #5742) (from r107414)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112576 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:26:45 +00:00
Ingo Schommer
ca02b91673 BUGFIX: TableListField_Item::SelectOptionClasses() can not use it parent protected variable. (from r105876)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:52:05 +00:00
Ingo Schommer
8a2576ee3e BUGFIX: rollback r105858 which introducesa bug (from r105875)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112505 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:51:48 +00:00
Ingo Schommer
91700a3dac BUGFIX: updated select options classes to work with the dataobjectset returned by selectoptions rather than the array previously (from r105872)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112504 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:51:33 +00:00
Ingo Schommer
092a3c1c26 BUGFIX: TableListField_Item::SelectOptionClasses() can use it parent protected variable. (from r105858)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112503 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:51:04 +00:00
Ingo Schommer
12fa850986 ENHANCEMENT: Preserve sort options in pagination links in TableListField (from r105275)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112475 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:29:44 +00:00
Ingo Schommer
bcbe9c254d ENHANCEMENT Allowing batch checkbox selection of TableListField rows with TableListField->Markable and TableListField->addSelectOptions() (from r105266)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:27:59 +00:00
Sam Minnee
961d4ce298 BUGFIX: added optional separator for http_build_query in HTTP:setGetVar(). this fixes sorting columns in ModelAdmin (ticket #5325). (from r103012)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:48:24 +00:00
Sam Minnee
a96cb319d3 BUGFIX Fixed TableListField->print() - was unsetting $cachedSourceItems instead of null'ing it, which breaks later access to the property (from r101080)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111583 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:44:58 +00:00
Ingo Schommer
e78dc5273d ENHANCEMENT Allowing custom popup requirements in ComplexTableField without subclassing through $requirementsForPopupCallback
MINOR Added getParentController() to TableListField_ItemRequest and ComplexTableField_Popup
MINOR Extending ComplexTableField_ItemRequest from TableListField_ItemRequest to avoid redundant code (from r100774)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105649 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 05:00:25 +00:00
Ingo Schommer
6460d09570 MINOR Fixed phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@103385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-23 00:11:41 +00:00
Ingo Schommer
dd7273b27a MINOR Removed useless third argument to instantiation of itemClass in TableListField::generateExportFileData() (from r98544)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102768 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 02:20:28 +00:00
Ingo Schommer
bfb10b849f BUGFIX Fixed missing third argument to ComplexTableField_Item when the parent class instantiates it (from r98448)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102759 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 02:16:07 +00:00
Ingo Schommer
b3e30ac819 MINOR set Print flag correctly on TLF
MINOR custom print template for SSReport TLF's that exposes the report title, and filters set (from r97138) (from r98154)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102621 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:26:52 +00:00
Ingo Schommer
eba6c9b492 MINOR: Fixed TableListField tests that don't set $_REQUEST['url'] (from r97127) (from r98153)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102620 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:26:38 +00:00
Ingo Schommer
19f566675b BUGFIX pagination was being applied (with a limit of NULL) to print and export actions. This was due to $_REQUEST['methodname'] not existing. (from r97114) (from r98152)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102619 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:26:27 +00:00
Ingo Schommer
10537d5133 MINOR move sort column&direction into their own vars, otherwise, canSortBy(Date DESC) will always return false, since DESC is not part of the column name. (from r96411) (from r98137)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:16:34 +00:00
Ingo Schommer
be4c42f9d0 BUGFIX still use the correct methods to get a value, even if we're generating a CSV ($xmlSafe = false) (from r96212) (from r98136)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:16:21 +00:00
Ingo Schommer
4f461e4b99 MINOR fix field escaping in CSV export of TableListField (from r96157) (from r98135)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102607 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:16:08 +00:00
Ingo Schommer
f60c080337 BUGFIX: Don't default to sorted descending if you already have a different column sorted ascending. (from r96061) (from r98134)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102606 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:15:50 +00:00
Ingo Schommer
d743cdef78 BUGFIX: Make TableListField sort checking use SQLQuery::canSortBy() to let SSReprot_FakeQuery work.
ENHANCEMENT: Allow sort descending as well as ascending. (from r96054) (from r98132)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102604 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:15:23 +00:00
Ingo Schommer
453faed88a API CHANGE: Refactored test for whether a SQLQuery can be sorted by a particular column into SQLQuery::canSortBy($fieldName) (from r95850) (from r98096)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:06:12 +00:00
Ingo Schommer
da778dd2a9 BUGFIX: Make TableListField rely on SQLQuery for its count-generation.
BUGFIX: Make SQLQuery return an appropriate count if a HAVING clause is used. (from r95814) (from r98094)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:05:45 +00:00
Ingo Schommer
fa5af56384 MINOR: Boundary condition check in TableListField for more helpful errors. (from r95543) (from r98088)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102580 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:01:39 +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
c3e213b690 ENHANCEMENT Allow overriding TableListField_Item on TableListField by setting the property itemClass (merged from r98428)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-11 04:21:04 +00:00
Sean Harvey
0d1f39ff88 BUGFIX: Fix fatal error when exporting a csv from a tablefield with a custom query (from r95108)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95634 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:49:14 +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
Andrew Short
79773042be API CHANGE: Renamed conflicting classes to have an "SS_" namespace, and renamed existing "SS" namespace to "SS_". The affected classes are: HTTPRequest, HTTPResponse, Query, Database, SSBacktrace, SSCli, SSDatetime, SSDatetimeTest, SSLog, SSLogTest, SSLogEmailWriter, SSLogErrorEmailFormatter, SSLogErrorFileFormatter, SSLogFileWriter and SSZendLog.
MINOR: Replaced usage of renamed classes with the new namespaced name.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 03:06:31 +00:00
Sean Harvey
7f7e3a0ba3 API CHANGE: TableListField customQuery and customCsvQuery won't automatically include ID, ClassName, and RecordClassName fields (from r87354)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:36:33 +00:00
Sam Minnee
96e449225e BUGFIX: If a CTF without a show action is made readonly, don't add the show action back. (from r88960)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:39:07 +00:00
Sam Minnee
7dd6d10cde MINOR added more documentation around SiteConfig. Also wrote unit tests for permissions inheritance off it. (from r86132)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89164 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:53:15 +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
Geoff Munn
69563972e5 MINOR FIX: columns quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-17 00:18:43 +00:00
Ingo Schommer
f86bc6f715 ENHANCEMENT Added TableListField->paginationBaseLink
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-15 04:11:13 +00:00
Sam Minnee
73cfe3ab84 API CHANGE: Added increase_time_limit_to(), which respects safe_mode.
API CHANGE: Added no-arg option to increase_memory_limit_to()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80241 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-28 02:36:46 +00:00
Sam Minnee
ab9c826ba2 BUGFIX: Fixed TableListField SQL generation so as not to add redundant duplicate columns. This builds on the change made in r50945, and keeps the behaviour the same as that, but note that r50945 removed the ability to include columns selected from a joined table, which was the original purpose of this code block.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79312 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 03:05:15 +00:00
Ingo Schommer
0298ee7d7a MINOR Fixed merge error from r78095 (reverted commit in TableListField made in r77298)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-02 01:37:53 +00:00
Sam Minnee
30517119d4 ENHANCEMENT: Improve TableListField query generation, so that it checks whether the DataObject has a database field, rather than just checking to see if it *doesn't* have a field or method.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-31 11:07:28 +00:00
Sean Harvey
838b6f3785 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78095 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-28 07:08:23 +00:00
Ingo Schommer
90ebeaf741 API CHANGE Automatically using DBField->Nice() in tabular view of TableListFields (and subclasses like ComplexTableField) instead of using the scalar value. This means for example values casted as Boolean will render as "Yes"/"No" rather than "1"/"0"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77549 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 04:48:24 +00:00
Sean Harvey
e768d955df ENHANCEMENT #3677 Added more rules for escaping reserved characters in XML to their proper entities e.g. ' => &apos;
BUGFIX When exporting data from TableListField to a CSV via TableListField_Item->Fields(), don't convert the values to XML
MINOR Added test class ConvertTest with tests for various Convert functions



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77298 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 03:09:50 +00:00
Sean Harvey
f7a974ccd4 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77245 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-19 10:32:06 +00:00
Sean Harvey
619c570801 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77066 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 05:30:26 +00:00
Sean Harvey
4ded1f4930 Merged r77016 from sapphire/branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77017 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 22:59:48 +00:00