Commit Graph

3726 Commits

Author SHA1 Message Date
Ingo Schommer
c726569bcf BUGFIX Version field weird'ed up rollback functionality (from r89464) (from r96715)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:46:47 +00:00
Ingo Schommer
1ed1348cf3 MINOR update merge info, merged in r87119 (from r88839) (from r96714)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102337 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:46:20 +00:00
Ingo Schommer
603657b943 MERGE merged back a whole bunch of defect fixes from trunk (from r87846) (from r96712)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102336 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:45:52 +00:00
Ingo Schommer
670bd4bce4 MINOR changed the method to get a page's siteconfig, it is now subsite aware. (from r89870) (from r96710)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:44:06 +00:00
Ingo Schommer
07aae82ac7 BUGFIX: Make sure Linkto Dropdown works right with filter() (from r96705)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102334 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:43:49 +00:00
Ingo Schommer
5c6f3d59d7 BUGFIX: alternative function for versions of PHP prior to version 5.2 (from r96681)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102333 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:43:32 +00:00
Ingo Schommer
c29cf7d302 BUGFIX: array_fill_keys function created for version prior to PHP 5.2 (from r96680)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102332 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:43:18 +00:00
Ingo Schommer
6491e3de26 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102330 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:41:11 +00:00
Ingo Schommer
22e789e916 BUGFIX: Allow set objects as properties if the property is not a database field (from r96663)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102329 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:36:30 +00:00
Ingo Schommer
58782bcf2a BUGFIX: anchor, target, and title are not set on a link that's inserted without selection. Also when using createElement in that way firefox encodes the spaces within href parameter breaking the shortcodes. Switched to using the 'mctmp' placeholder now. (from r96623)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102328 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:36:12 +00:00
Ingo Schommer
21a6cf52cc BUGFIX: Fixed reloading of TableFields after ajax save. (http://mingle.silverstripe.com/projects/air_nz_cms_enhancements/cards/154) (from r88921) (from r96427)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:35:47 +00:00
Ingo Schommer
95597b1823 BUGFIX: Fix multiselect tree selection, since changes in r91342 (from r96363)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:35:33 +00:00
Ingo Schommer
155cce25e5 BUGFIX: Readonly TreeMultiSelectField has form linked properly (from r96362)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102325 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:35:17 +00:00
Ingo Schommer
eba3409c20 ENHANCEMENT Added Date::Rfc3339() for returning an RFC 3339 valid date format (from r96010) (from r96049)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102324 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:34:42 +00:00
Ingo Schommer
bf57bee1f0 BUGFIX #4140 When clicking a tree node that was just dragged, "Stack overflow" error would be given in IE. Firebug would report "Too much recursion" (from r95973)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102323 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 00:51:43 +00:00
Ingo Schommer
0375eea256 BUGFIX: Fallback for arrays which do not contain 'alreadyLoggedIn' values (from r95968)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102322 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 00:51:21 +00:00
Ingo Schommer
60453176ef MINOR Added unit test for ViewableData::MultipleOf() when using an offset of 1 (an alternative approach) (from r95966)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 00:50:16 +00:00
Ingo Schommer
6dc8146a87 BUGFIX: SSViewer now allows cli to do a flush on non-dev environments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102311 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-11 23:47:17 +00:00
Sam Minnee
fa016ed6b9 ENHANCEMENT: Parse template includes at runtime, so that recursive templates and automatic recompilation of included templates work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@100972 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-03-12 03:08:59 +00:00
Ingo Schommer
c604341a1d API CHANGE Removed "auto-merging" of member records from Member->onBeforeWrite() due to security reasons - please use DataObject->merge() explicitly if this is desired behaviour
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@100705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-03-09 04:10:38 +00:00
Ingo Schommer
f4e284a3c1 BUGFIX Fixing Member_ProfileForm to validate for existing members via Member_Validator to avoid CMS users to switch to another existing user account by using their email address
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@100704 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-03-09 04:08:52 +00:00
Ingo Schommer
ca27086c84 BUGFIX Fixed SiteTree->MetaTags() to either use <meta name=> or <meta http-equiv=>, and only using the "http-equiv" attribute for valid HTTP headers (see http://www.w3.org/TR/html4/struct/global.html#edef-META)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@100631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-03-08 20:26:34 +00:00
Ingo Schommer
0b1fc5b91b BUGFIX Quoting keys in JSONDataFormatter to ensure valid JSON (#5119)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99853 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-25 00:00:24 +00:00
Ingo Schommer
a4e14d3c56 ENHANCEMENT Allow DataObjectSet to remove duplicates based on any field (#5094, thanks mobiusnz)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-23 22:15:23 +00:00
Ingo Schommer
ddbc3e96b3 MINOR Fixed OptionsetField->disabledItems omission from r99596
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99708 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-23 04:48:56 +00:00
Ingo Schommer
03b94346ad MINOR Removed message alteration from ValidationResult->error() to make it more predictable for string matching in unit tests like SecurityTest (merged from r98275)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-23 04:31:47 +00:00
Ingo Schommer
61e27830c6 MINOR Fixed unit tests after change Member->checkPassword() to return ValidationResult instead of boolean (see r98268) (merged from r98274)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-23 04:05:34 +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
Ingo Schommer
8a1b1960c0 MINOR Placing 'ADMIN' permission in new 'Administrator' group at the top of the permissions list
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 10:02:10 +00:00
Ingo Schommer
09de9f7834 ENHANCEMENT Only show 'HTML Editor Config' dropdown in Group->getCMSFields() if more than one option exists
BUGFIX Fixed bogus HTMLEditorConfig instance when get() is called without a valid identifier (due to NULL database columns)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99599 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 09:38:15 +00:00
Ingo Schommer
9c00cac768 ENHANCEMENT Showing checkboxes as disabled for inherited roles in Group->getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99597 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 06:11:59 +00:00
Ingo Schommer
93895a4f0f ENHANCEMENT Added OptionsetField->setDisabledItems() to allow specifically disabling certain checkboxes
ENHANCEMENT Added CheckboxSetField->setDefaultItems() to tick specified checkboxes regardless of the value passed

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99596 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 06:11:58 +00:00
Ingo Schommer
4a93c9f6a7 MINOR Localized strings in PermissionCheckboxSetField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 04:52:27 +00:00
Ingo Schommer
11ad275522 FEATURE Showing (readonly) permissions for a Member record in admin/security popup
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 04:37:36 +00:00
Ingo Schommer
705eaae2c3 ENHANCEMENT PermissionCheckboxSetField_Readonly (with all checkboxes disabled)
MINOR Re-adding support for Group and PermissionRole records in PermissionCheckboxSetField
ENHANCEMENT Added 'assigned to...' label to group permissions in PermissionCheckboxSetField - used in Member->getCMSFields() readonly permission view

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99585 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 04:37:35 +00:00
Ingo Schommer
19336e2fcb ENHANCEMENT Allowing PermissionCheckboxSetField to inspect multiple group records for existing permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99584 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 04:37:34 +00:00
Ingo Schommer
246e866362 MINOR Using localized titles for permission formfields in PermissionRole and Member
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99583 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 04:37:34 +00:00
Ingo Schommer
17272c2126 MINOR Using TreeMultiselectField instead of MemberTableField->relationAutoSetting in Group->getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 04:37:33 +00:00
Ingo Schommer
fcfccf6231 BUGFIX Fixed TreeMultiselectField/TreeDropdownField saving with 'unchanged' default values from constructor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99581 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 04:37:33 +00:00
Ingo Schommer
26ca64a579 MINOR Added ComponentSetTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99580 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 04:37:32 +00:00
Ingo Schommer
aea2f94a5e FEATURE View and select groups for a specific member via the member popup in admin/security (requires EDIT_PERMISSIONS)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98880 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 04:01:42 +00:00
Ingo Schommer
e26158c522 BUGFIX Fixed TreeMultiselectField->Field() to respect settings, and give them priority over existing relations through getItems(). This is used in MemberTableField to set default groups for 'add member' popups.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 04:01:41 +00:00
Ingo Schommer
e6aa5b8ee5 MINOR Moved generic .TreeDropdownField styling from cms/css/cms_right.css to sapphire/css/TreeDropdownField.css
MINOR Fixed .TreeDropdownField styling (borders and margins) in TreeDropdownField.css (was assumed to be inherited from LeftAndMain/CMS stylesheets)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98878 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 04:01:40 +00:00
Ingo Schommer
89982fa115 MINOR Moved ul.tree rules from cms/css/cms_left.css to sapphire/javascript/tree/tree.css (particularly around multiselect tickbox styling) (merged from r98854)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98864 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 02:41:11 +00:00
Ingo Schommer
e12e57e87f MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 02:40:32 +00:00
Ingo Schommer
13d744eeb3 BUGFIX Added missing Requirements to TreeDropdownField->Field() and TreeMultiSelect->Field() (merged and modified from r98852)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98861 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 02:39:07 +00:00
Ingo Schommer
d552becce8 MINOR Added MemberCsvBulkLoaderTest->testCleartextPasswordsAreHashedWithDefaultAlgo()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 00:58:10 +00:00
Ingo Schommer
021c5af01c MINOR Allow custom TitleText on TableListField_Item.ss (e.g. to show a description of the 'delete' button)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-11 21:55:46 +00:00
Ingo Schommer
735ed967a5 MINOR Setting new 'inlineadd' permissions on MemberTableField instance in Group->getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98827 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-11 21:55:44 +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