650 Commits

Author SHA1 Message Date
Sean Harvey
88d7a32017 BUGFIX Put the order of save and publish buttons back to normal (so save and publish are next to eachother)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
b1846439a7 MINOR removed debug code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
78406d7c1f ENHANCEMENT Moving "save" and "delete" cms actions from CMSMain->EditForm() into SiteTree->getCMSActions() to make them decoratable (e.g. disallow delete action) and easier to cover with unit tests. Leaving fallback "save" and "delete" actions in CMSMain in case no actions are defined (necessary e.g. for Group class in SecurityAdmin)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67061 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Sam Minnee
7671dc644b BUGFIX: Fixed Enum::scaffoldSearchForm() to always include an (All) option
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67045 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Sam Minnee
c7a4afee52 BUGFIX: Fixing tests
ENHANCEMENT: Add <%-- --%> comments

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66946 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
322fa2a547 BUGFIX Returning a boolean instead of Permission IDs in specific SiteTree->canEdit() case
BUGFIX Passing through $member param from SiteTree->canPublish() to SiteTree->canEdit()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66740 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Ingo Schommer
524a003d24 MINOR merged r66672 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66700 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Ingo Schommer
93dd7600df ENHANCEMENT Renamed tab "Meta-data" to "Metadata" for better readability (see #3142)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Sam Minnee
be6e67a20f DataObject::relObject() throws an exception rather than an error so that it can be caught
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66645 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Sean Harvey
7874d09771 MINOR Removed redundant code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Sean Harvey
0d450e6c3a BUGFIX Fixed flaw logic checking for $member variable, since it's always set the alternative for choosing Member::currentUser() would never work.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00
Sean Harvey
a2d5a9ac75 MINOR Code formatting of !isset($member) on SiteTree->canAddChildren() for consistency with other can*() methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66637 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00
Sean Harvey
8089d7b14c MINOR Renamed to correct updateCMSActions() in php comment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66636 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00
Sean Harvey
640c50149d BUGFIX Fixed SiteTree->getCMSActions() so it returns a FieldSet, instead of a DataObjectSet. This makes it consistent with DataObject->getCMSActions() as well as SiteTree->getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66635 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00
Sean Harvey
4713842790 BUGFIX Fixed SiteTree->getCMSActions() not extending properly because it was passing an array to the extend() 2nd argument, which expected a FieldSet object
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00
Sam Minnee
b877ddb546 Added support to DataObject::relObject() for looking at $casting to get information about the relation - good for dynamic relations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:36 +13:00
Normann Lou
92e7071412 APICHANG: if a DataObject has getCMSActions, its model admin should be able to add them.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:36 +13:00
Sam Minnee
9d1be81b41 Merge pre-2.3-oct08 into 2.3 (via trunk)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66353 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:36 +13:00
Ingo Schommer
a9bc9c6845 BUGFIX Fixed ForeignKey->scaffoldFormField() usage of model class instead of relation class to generate dropdown list
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66313 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:35 +13:00
Sean Harvey
76f15e47bf MINOR Removed old references from workflow in SiteTree and VirtualPage (AssignedToID and RequestedByID were old properites of a workflow page type)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66311 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:35 +13:00
Sam Minnee
b40dbbb2f0 BUGFIX: Merged from trunk; fix DataObject::hasDatabaseFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66269 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:34 +13:00
Sam Minnee
6d5db643ab API CHANGE: Improve encapsulation of cookies in Director::test()
BUGFIX: Fix test/cookie conflict in ErrorPage rendering

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:34 +13:00
Andrew O'Neil
d76611f380 #2771: Fix SQLQuery::filtersOnID() (wakeless)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:34 +13:00
Andrew O'Neil
e3298047c3 #2635 - More informative errors in DataObject (simon_w)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66192 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:34 +13:00
Ingo Schommer
c6bf307b94 ENHANCEMENT Moving GoogleSitemap functionality (priority dropdown and database fields) from SiteTree to GoogleSitemapDecorator
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:34 +13:00
Ingo Schommer
2153737da7 ENHANCEMENT Added SiteTreeDecorator
ENHANCEMENT Addings hooks in SiteTree for onBeforeUnpublish and onAfterUnpublish
ENHANCEMENT Removed GoogleSitemap references in SiteTree (moving to decorator implementation)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:34 +13:00
Ingo Schommer
1cdca8a66a BUGFIX Fixed editable formfields not showing up in translation mode (#3083). Updated Translatable->updateCMSFields() by partially merging wakeless' patch from (r64523)
ENHANCEMENT Added Translatable_Transformation (patched in r64523)
ENHANCEMENT Added TranslatableTest with minimal assertions about existing form fields in translation mode

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:33 +13:00
Ingo Schommer
db0815c115 BUGFIX Fixed PHP variable initialization in SiteTree->getClassDropdown() which broke class dropdown in behaviour tab (regression from r66092)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:33 +13:00
Ingo Schommer
e99ca1092f MINOR Fixed PHP Notice in SiteTree
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:33 +13:00
Will Rossiter
a92d2120a1 Merged pre-2.3-oct08 into branches/2.3 (via trunk)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:33 +13:00
Sean Harvey
b9115b8088 BUGFIX Fixed incorrect call to Permission::checkMember() - missing second argument, first argument should've been a Member object or Member ID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66027 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:32 +13:00
Sean Harvey
3c7a72e22a BUGFIX Fixed PHP notice level error in some circumstances in DataObject->buildDataObjectSet()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66026 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:32 +13:00
Sam Minnee
176a865dc4 Boundary condition check for top-level pages with 'inherit' permission
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:32 +13:00
Sam Minnee
60eafbcd9d Added validation for DataObject::db, has_one, has_many, many_many, belongs_many_many properties, so that improper use of the array syntax doesn't raise strange bugs elsewhere.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@65967 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:32 +13:00
Sam Minnee
f3543e670a BUGFIX #3066: Fix ?isDev=1 option
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@65923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:32 +13:00
Sam Minnee
daac81e7f1 Set default view/edit permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@65915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:32 +13:00
Sam Minnee
6463503082 Added notinmenu class to CMS tree items that aren't in menus
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@65912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:32 +13:00
Sam Minnee
4e2388848b BUGFIX #2232: Prevent requirements from breaking ErrorPage publication
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@65895 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:31 +13:00
Sam Minnee
05e042427b BUGFIX #3061: Text.FirstSentence returns '.' instead of '' on an empty field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@65842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:31 +13:00
Sam Minnee
73a075a491 FEATURE #594: Added javascript-on-demand support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 04:31:33 +00:00
Ingo Schommer
91c0ca0755 BUGFIX Adjusted Translatable to api changes from r65581
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65583 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-11 02:37:01 +00:00
Ingo Schommer
79a7e6d27a ENHANCEMENT Using actual classname in DataObjectSet->debug()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-11 02:36:30 +00:00
Sam Minnee
9565fec5ad FEATURE #2767 wakeless: Allow popuplation of non-DataObject tables with YamlFixture
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 23:18:31 +00:00
Ingo Schommer
5c9f0f120b BUGFIX Setting correct user locale in ImageField and FileIframeField - the controller is separate from the CMS context, so wasn't initialized with i18n (see #1727)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65539 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 19:54:30 +00:00
Ingo Schommer
5d9550c214 BUGFIX Making Metadata fields writeable in translation mode (see #2993)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65536 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 11:11:13 +00:00
Sam Minnee
58dbe416ee Merged from branches/2.2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65523 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 03:51:35 +00:00
Ingo Schommer
9c9a461d67 BUGFIX Removed project-specific hack in DataObject->getManyManyComponentsQuery() as it was breaking Translatable saving
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65518 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 02:36:21 +00:00
Ingo Schommer
4452e9bb5b ENHANCEMENT Updated UpgradeSiteTreePermissionSchemaTask to rename obsolete database columns
ENHANCEMENT Calling UpgradeSiteTreePermissionSchemaTask from SiteTree->requireDefaultRecords as a temporary workaround for missing migration infrastructure. This means that upgrading the schema for 2.3 can be done without manual task triggers, just the usual dev/build (see http://open.silverstripe.com/ticket/2847#comment:4)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65495 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-09 23:58:48 +00:00
Ingo Schommer
117806756c ENHANCEMENT Added Database->renameField() and Database->dontRequireField()
ENHANCEMENT Added DatabaseTest

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65494 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-09 23:56:24 +00:00
Ingo Schommer
e6a95566d9 MINOR Removed obsolete code from MySQLDatabase
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-09 23:21:16 +00:00