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
2,319 Commits 31 Branches 527 Tags 162 MiB
05dd641817
Commit Graph

535 Commits

Author SHA1 Message Date
Sean Harvey
05dd641817 ENHANCEMENT Allow choosing ellipsis for truncated text on Text->LimitWordCountXML() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69224 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:52 +13:00
Sean Harvey
5f0bbbc0da BUGFIX Strip potential whitespace from the beginning and end of string before limiting word count in Text->LimitWordCount(), fixing potential interference with truncation process 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69222 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:52 +13:00
Sean Harvey
6a04824ef9 MINOR Removed comment that isn't appropriate 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69221 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:52 +13:00
Sean Harvey
358fbd418e BUGFIX Fixed Text->LimitWordCount() not returning the correct number of words in the truncated text. 
MINOR Added TextTest for testing Text class methods

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69220 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:51 +13:00
Sean Harvey
576f7e15c6 MINOR Updated phpDoc cautionary message on Text->LimitCharacters() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69219 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:51 +13:00
Sean Harvey
9ded3dfd1f MINOR Added documentation to various Text class methods for limiting field values 
ENHANCEMENT Added ability to define the ellipsis for LimitWordCount() setting "..." as the default

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69218 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:51 +13:00
Ingo Schommer
5115c38355 ENHANCEMENT Changed order of array merging in DataObject->db() - contains fields from subclasses at end of the array instead of the beginning. Important because db() is used by FormScaffolder, which shoved custom fields on the front of auto-generated forms. Shouldn't have any effect on the actual content of returned array 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69207 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:51 +13:00
Sam Minnee
5a5bdef2ba BUGFIX: Fixed bug in SQLQuery::unlimitedRowCount() when used with grouped queries, that should fix a lot of pagination situations. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68940 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:51 +13:00
Andrew O'Neil
064a9019b0 BUGFIX: Make sure date is a string before trying to use strtotime 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68834 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:50 +13:00
Ingo Schommer
1cdb9bb61d BUGFIX Fixed sprintf detection bug in SiteTree->getClassDropdown() 
ENHANCEMENT Appending classnames to translated pagetype titles in SiteTree->getClassDropdown() when the cms is loaded in a non-english version - see inline comment

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68817 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:50 +13:00
Andrew O'Neil
915decb1f6 BUGFIX: Check hasChanged method exists before calling it 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68809 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:50 +13:00
Ingo Schommer
5a31a74b6f BUGFIX Fixed label spacing in Date->TimeDiff() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68762 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:50 +13:00
Ingo Schommer
76f4af842e ENHANCEMENT Making Date->Ago() translatable 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68761 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:50 +13:00
Ingo Schommer
18a6b34836 ENHANCEMENT Improved translation of SiteTree->getClassDropdown() - setting page name in quotes, using i18n singular/plural titles, using sprintf() to output "change to..." content 
ENHANCEMENT Using i18nEntityProvider on SiteTree to ensure entities in "Page" namespace get stored on sapphire instead of the "module folder" for Page.php - we can't make those properties translatable within core if they are in a custom folder
MINOR translation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68747 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:49 +13:00
Sam Minnee
63aa35092b Merged r67482 to branches/2.3 - let db/build add auto_increment 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68474 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:48 +13:00
Sam Minnee
b26bd547ba BUGFIX: Escape table name in versioned to allow creation of page type classes with the same names as SQL reserved words 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68170 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:48 +13:00
Ingo Schommer
98c00440ad BUGFIX Added stub PDODatabase->renameField() implementation to avoid errors when batch-instanciating singletons 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:48 +13:00
Ingo Schommer
dcfb88b2e8 BUGFIX Improved DataObjectSet->PaginationSummary() to show full context (instead of halved) when on first or last page 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68039 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:47 +13:00
Ingo Schommer
d530706093 ENHANCEMENT Documented and improved DataObjectSet->PaginationSummary(). Removed DataObjectSet->paginationSummaryDots 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67984 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:47 +13:00
Saophalkun Ponlu
06efa9e0c8 Changed ... to html entiries … 
PaginationSummary return all pages by default

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67877 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:47 +13:00
Saophalkun Ponlu
d5abb2bd87 Added PaginationSummary function that enable DataObjectSet to display a portion of page list 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67793 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:47 +13:00
Sam Minnee
0b0908f8a3 BUGFIX: SSDatetime can handle being given a NZ date in dd/mm/yyyy format 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67530 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:45 +13:00
Sean Harvey
c96d891c2c MINOR Removed whitespace after ?> end PHP tag 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67467 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:45 +13:00
Ingo Schommer
2381e480c3 ENHANCEMENT Allowing custom methods in DataObjectSet->column() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67345 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:44 +13:00
Sean Harvey
90fb060b58 BUGFIX Since ModelAsController->handleRequest() expects a URLSegment, we make the ErrorPage Link() return a relative URLSegment in ErrorPage->publish() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67304 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:44 +13:00
Sean Harvey
7c03f7364b BUGFIX Changed Director::test($this->URLSegment) to Director::test($this->Link()) in ErrorPage->publish() to be more robust 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67299 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:44 +13:00
Ingo Schommer
1b1b1a1d78 MINOR Re-enabled calls to updateCMSFields() accidentally disabled in r67294 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67295 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:44 +13:00
Ingo Schommer
3b50d5de00 ENHANCEMENT Added SITETREE_GRANT_ACCESS permission code to SiteTree to control editability of the "Access" tab (incl. unit tests) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67294 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:43 +13:00
Josh Kosmala
d839201092 BUGFIX: Filter on the baseclassid in Hierachy, not the class id, in case the class doesnt have a table (aoneil) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67268 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:43 +13:00
Ingo Schommer
958ad1c4e0 MINOR Merged r66794 from trunk (related to #3192) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67213 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:41 +13:00
Andrew O'Neil
c305bf3e1e BUGFIX: Fixed incorrect permission checking when the current member isn't being used 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67199 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:41 +13:00
Andrew O'Neil
2132e8e301 Merged r67152 from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67194 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:41 +13:00
Ingo Schommer
4469283166 BUGFIX Checking for "$this instanceof VirtualPage" instead of "$this->class == 'VirtualPage' to support subclassing in VirtualPage->onBeforeWrite() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67150 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:41 +13:00
Ingo Schommer
933ade1692 BUGFIX Checking for existence of $this->record in VirtualPage_Controller->init() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67140 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:40 +13:00
Andrew O'Neil
a037a24148 BUGFIX: Fix publishing of error pages 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67137 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:40 +13:00
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