Commit Graph

48 Commits

Author SHA1 Message Date
Sean Harvey
325f4b6b6f BUGFIX Ensure that before creating default 404 error page, we don't have one already that exists with a record ID (from r81991)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89714 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:22:15 +00:00
Sam Minnee
cad7d5e859 ENHANCEMENT: Make base tag in 404 page dynamic (from r72282)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88633 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-12 03:23:10 +00:00
Andrew Short
06fbb96f88 API CHANGE: Decoupled ErrorPage::response_for() from the request and updated it so it will only return a response if an appropriate error page can be found.
MINOR: Updated ContentController->httpError() to use Controller->httpError() if there is no error page.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:25 +00:00
Andrew Short
acc063984b ENHANCEMENT: Added ErrorPage::response_for() to get a response for a HTTP error code and request.
MINOR: Updated ModelAsController to generate errors with ErrorPage.
MINOR: Updated ContentController to generate HTTP errors with ErrorPage.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:03 +00:00
Ingo Schommer
681380424a BUGFIX Fixed empty ErrorPage types in output by setting status code in init() instead of index() and checking for "index" action - introduced in r75096 (see #3960)
BUGIFX Changed ErrorPage->publish() to doPublish->doPublish() - the publication of static HTML into the /assets directory was lagging one version behind the actual published content
BUGFIX Fixed wrong parameter in ErrorPage::get_static_filepath()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-04 02:20:57 +00:00
Ingo Schommer
7e41cc2b8e BUGFIX Fixed ErrorPage::get_filepath_for_errorcode() to work with locale values instead of short language subtags
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75791 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-30 23:51:55 +00:00
Sean Harvey
a5e82ddff1 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 01:20:24 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 00:07:39 +00:00
Ingo Schommer
e482ada014 API CHANGE Deprecated Translatable::enable() and i18n::enable()- use Object::add_extension('SiteTree','Translatable'), Deprecated Translatable::disable() and i18n::disable() - use Object::remove_extension('SiteTree','Translatable'), Deprecated Translatable::enabled() - use $myPage->hasExtension('Translatable')
API CHANGE Removed Translatable::creating_from() - doesn't apply any longer
ENHANCEMENT Translatable extension is no longer hooked up to SiteTree by default, which should improve performance and memory usage for sites not using Translatable. Please use Object::add_extension('SiteTree','Translatable') in your _config.php instead. Adjusted several classes (Image, ErrorPage, RootURLController) to the new behaviour.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73951 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-01 16:35:32 +00:00
Ingo Schommer
7ad7f8dcf2 ENHANCEMENT Adjusted SearchForm, Debug, ErrorPage, SiteTree to using locales instead of lang codes
API CHANGE Changed Translatable datamodel to use locales ("en_US") instead of lang values ("en).
API CHANGE Changed Translatable::$default_lang to $default_locale, Translatable::$reading_lang to $reading_locale
API CHANGE Using "locale" instead of "lang" in Translatable::choose_site_lang() to auto-detect language from cookies or GET parameters
API CHANGE Deprecated Translatable::is_default_lang(), set_default_lang(), get_default_lang(), current_lang(), set_reading_lang(), get_reading_lang(), get_by_lang(), get_one_by_lang()
API CHANGE Removed Translatable::get_original() - with the new "translation groups" concept there no longer is an original for a translation
BUGFIX Updated MigrateTranslatableTask to new Locale based datamodel

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-20 08:47:06 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-01 23:49:53 +00:00
Ingo Schommer
7057b56b2c ENHANCEMENT Making ErrorPage static HTML files translatable (#2233)
ENHANCEMENT Added ErrorPage::$static_filepath to flexibly set location of static error pages (defaults to /assets)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@70326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-19 01:25:23 +00:00
Ingo Schommer
d26f08b481 MINOR merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@67465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:32 +00:00
Sam Minnee
93438e0be2 API CHANGE: Adding double quotes to all table and field references (a work in progress)
API CHANGE: DataObject::get()'s GROUP BY clause is only generated for MySQL as it needs to be improved for other databases to accept it.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 23:28:16 +00:00
Sam Minnee
2984355f43 Merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-22 03:33:00 +00:00
Sam Minnee
3d9532db83 Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:37 +00:00
Ingo Schommer
3edc358ead ENHANCEMENT Added fieldLabels() overloading to various DataObject subclasses. Use this method instead of directly calling _t() in getCMSFields(), and use fieldLabel('MyField') to get the label for a specific FormField. This way, we can transparently support formfield scaffolding and re-use the labels for search fields automatically.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65072 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-02 20:04:10 +00:00
Sean Harvey
ee5b0e2447 MINOR ErrorPage removal of ShowInMenus explicitly being set - this is done using static $defaults on the class itself.
MINOR ErrorPage phpDoc updates - removal of non-existant token @usedby, replaced with @see
MINOR Code formatting changes to be more consistent

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-18 22:31:04 +00:00
Ingo Schommer
2a02c8f08a MINOR Documentation in ErrorPage
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-01 14:57:06 +00:00
Ingo Schommer
5d3e815967 API CHANGE Changed parameters for Debug::friendlyError()
ENHANCEMENT Using DebugView class in Debug::friendlyError()
ENHANCEMENT Using Debug::friendlyError() in HTTPResponse class if status code signifies error (only on live environments in non-ajax requests)
ENHANCEMENT Showing contact information in Debug::friendlyError() from Email::getAdminEmail()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-01 14:43:43 +00:00
Ingo Schommer
9371f4688b ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-27 16:02:38 +00:00
Sean Harvey
41c9d5692e ENHANCEMENT ErrorPage:: should also list ShowInSearch as 0, since it is not required to be searched
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-20 04:48:44 +00:00
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:51:33 +00:00
Ingo Schommer
a599df309c (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:06:52 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
df48020ebe #2016 - Added all the types of error pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49143 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-06 23:13:53 +00:00
Sam Minnee
fea4042c3c rbarreiros: #1918 Translate newsletter and other strings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 03:28:13 +00:00
Sam Minnee
41a11b277e Improved API documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 00:34:18 +00:00
Sam Minnee
b1d2e3906b API Documentation updates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-09 04:18:36 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:37:50 +00:00
Andrew O'Neil
6921b5e1c1 Fixed bug with 404 header (merged from branches/2.2.0@45907, r45616)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:33:59 +00:00
Andrew O'Neil
e19ec7d93f #1432, #1557 - Added Director::set_status_code() and Director::get_status_code(), and used this to fix 404 errors. (merged from branches/2.2.0@45907, r45443)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:29:31 +00:00
Andrew O'Neil
6672339ddc Make ErrorPage return the correct response (merged from branches/2.2.0@45907, r45032)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:24:12 +00:00
Sam Minnee
f807c9f8ca #1408 - Create assets folder if it's not there on ErrorPage publish
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-28 08:14:49 +00:00
Ingo Schommer
393caf4287 FEATURE made sapphire i18n-capable
FEATURE a little bit of german translation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 02:47:45 +00:00
Andrew O'Neil
a181f7c151 Fixed duplicate getBody()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-03 00:10:49 +00:00
Ingo Schommer
39ae17224a bfojcapell: Fixed "Notice: Object of class HTTPResponse to string conversion" that caused nothing to be written in the static file.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:57:40 +00:00
Ingo Schommer
2a2b1db203 mlanthaler: Small fix to prevent E_NOTICEs.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:21:35 +00:00
Sam Minnee
b7ec0fd4df Fix ErrorPage publication
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40998 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-28 22:27:13 +00:00
Jeremy Shipman
e386cbae57 created alteration_message method to replace all the code used to echo changes when dbbuild runs, with appropriate colouring.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 03:31:14 +00:00
Jeremy Shipman
46c9efaecc Changed colouring of db/build to be more appropriate for the actual meaning of the messages.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 02:47:37 +00:00
Andrew O'Neil
16edb3a4c2 Don't publish ErrorPage on install, as the manifest is not guaranteed to be built yet
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40516 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-20 04:23:51 +00:00
Sam Minnee
35a87e84b3 Improved the encapsulation of ErrorPage publication
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:35:02 +00:00
Sam Minnee
f55e0bf547 Added PHPUnit unit testing framework
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40129 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-15 06:38:41 +00:00
Andrew O'Neil
97ff1db6f9 Fixed some php notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39034 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 23:15:05 +00:00
Hayden Smith
4a5d9b03f8 Moved Sapphire module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:28 +00:00