Ingo Schommer
43ab055876
MINOR merged r69857 from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:55 +13:00
Ingo Schommer
52857cce8f
MINOR Merged r69409 and r69410 from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69838 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:55 +13:00
Hayden Smith
338f286642
Added getter to retrieve alternative database name.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:54 +13:00
Sam Minnee
f28715775d
BUGFIX #2342 : Database names with hyphens and other special characters can now be used.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69715 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:54 +13:00
Will Rossiter
7b00e015fa
MINOR: merge patch from ajshort: allow db build without running requireDefaultRecords
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69562 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:53 +13:00
Sean Harvey
ae2cb53fb1
ENHANCEMENT Add a <span class="highlight"> around all keywords (space delimited) and not just the entire search phrase
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69370 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:53 +13:00
Sean Harvey
42520dff8f
MINOR Removed @todo from Text->ContextSummary as it's already done
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69369 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:53 +13:00
Sean Harvey
2ac842538d
MINOR Added phpDoc to Text->ContextSummary() $string argument
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69368 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:53 +13:00
Sam Minnee
1a9180abaa
ENHANCEMENT: Update ForeignKey and Primary key default fields to use SQLMap for their dropdown source for better performance.
...
API CHANGE: Add keyField and titleField arguments to SQLMap
BUGFIX: Get DrodpownField::$emptyString working when used with a SQLMap source
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:52 +13:00
Sean Harvey
ac83f9d4d9
MINOR Added todo and phpDoc to Text->ContextSummary()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69348 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:52 +13:00
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