Commit Graph

9929 Commits

Author SHA1 Message Date
Stig Lindqvist
22efd3848e BUG Calling DataObject::relField() on a object with an empty relation list
This causes a 'Fatal error: Call to a member function hasMethod() on a non-object'.

This can happen when displaying a field in a gridfield on a belongs_to relationship.
2012-12-19 16:47:07 +13:00
Ingo Schommer
9b3aebd310 Allow HTML in FormField->setDescription() 2012-12-18 15:02:23 +01:00
Mateusz Uzdowski
d5a1c3d99a BUG SS has problems handling + in URLs. Filter them out.
+ has a special meaning in the URLs so overall it's a good idea to
strip them out. Otherwise they would need to appear in their ugly url
encoded form "%2B".

Refer: http://open.silverstripe.org/ticket/7929
2012-12-18 09:44:47 +01:00
Ingo Schommer
8f239d6373 SimpleXML string casting in tests for older PHPUnit 2012-12-17 15:52:01 +01:00
Ingo Schommer
3b59d4a762 Updated translations 2012-12-17 11:45:09 +01:00
Ingo Schommer
e8f3e7b36e Only reset test state in SapphireTest if its previously been set
That's not the case e.g. if the *first* test in a suite
is skipped, so setUp() is never executed completely.
2012-12-17 11:44:08 +01:00
Simon Welsh
683f388d1c Merge pull request #1036 from howardgrigg/patch-5
Corrected link in Form field types docs
2012-12-14 02:15:54 -08:00
Howard Grigg
fbeaa4770a Corrected link in Form field types docs 2012-12-14 23:13:08 +13:00
Ingo Schommer
4f5b3fa3a6 Readd SQlite to travis builds, having it fail harms TDD 2012-12-14 10:40:40 +01:00
Ingo Schommer
90084bb708 Separate PHPCS run on travis, don't fail whole build for it 2012-12-14 10:20:58 +01:00
Stig Lindqvist
681a0241e7 DOC Removed link to missing 'extending-the-cms.md' 2012-12-14 16:15:22 +13:00
Sam Minnee
244bc97794 Don't register a PGSQL failure as a Travis build failure.
Although PGSQL build will still be executed, a failure of that build won't registre as a Travis failure.  This is a workaround until the PGSQL build has been fixed.
2012-12-14 14:28:26 +13:00
Ingo Schommer
f41f307118 Fixed spacing 2012-12-14 00:09:30 +01:00
Ingo Schommer
c6b1d4aa6b API Storing alternative DB name in cookie rather than session
Session is not initialized by the time we need to use
the setting in DB::connect(). Cookie values get initialized
automatically for each request.

Tightened name format validation to ensure it can only
be used for temporary databases, rather than switching
the browser session to a different production database.

Encrypting token for secure cookie usage.
Added dev/generatesecuretoken to generate this token.
Not storing in YML config directly because of web access issues.
2012-12-13 23:21:48 +01:00
Ingo Schommer
7be8a2252f Merge pull request #1024 from kinglozzer/8051-insert-media-duplicates
BUG Fix insert media form inserting images from other UploadFields (#8051)
2012-12-12 14:25:19 -08:00
Naomi Guyer
92e4b4fc5b Remove sub navigation for "Files" (fixes 7956)
Backport from master. Fixes display issues with expanded,
unselected submenus ... by removing them.
They're strictly not necessary since both "list" and "add"
modes can be reached through the default AssetAdmin UI.
2012-12-12 23:16:03 +01:00
Loz Calver
639cc0222c BUG Fix insert media form inserting images from other UploadFields (fixes #8051)
The insert media form would pick up unwanted images from other
UploadFields. Limiting where it is looking to only the closest form
fixes this.
2012-12-12 15:55:33 +00:00
Ingo Schommer
2e9b5e9221 Merge branch 'orm-join-bug' of git://github.com/stojg/sapphire into stojg-orm-join-bug 2012-12-12 15:53:19 +01:00
Ingo Schommer
441bb5f74c Added travis environment info output 2012-12-12 15:13:26 +01:00
Ingo Schommer
8fdea7a2ab Merge pull request #1019 from nyeholt/injector_convert_service_params
BUG Fixed issue with convertServiceProperty
2012-12-12 01:07:47 -08:00
Sam Minnée
b618909220 Merge pull request #1007 from simonwelsh/indent-sniff
Add codesniffer that ensures indentation is with tabs
2012-12-11 20:46:47 -08:00
Marcus Nyeholt
4f63f91cc8 BUG Fixed issue with convertServiceProperty
Fixed issue where convertServiceProperty is called when creating objects
with user-supplied constructor arguments, so that it's only called when
creating objects using injector configuration. This reduces the overhead
of unnecessary calls to convertServiceProperty.

Updated test cases to validate behaviour
2012-12-12 15:22:23 +11:00
Ingo Schommer
e8fbfc0bd1 NEW FixtureFactory separated out from YamlFixture
Enables more generic use of the fixture facilities
without dependency on the YAML format, for example
when creating fixtures from Behat step definitions.

Note: The YamlFixture class needs to be created via
Injector::inst()->create('YamlFixture') now,
direct instantiation is no longer supported.
2012-12-11 17:06:27 +01:00
Simon Welsh
fc5dd2994c Add codesniffer that ensures indentation is with tabs. 2012-12-12 00:12:11 +13:00
Sean Harvey
0f8b229d6b Modify Composer install path in docs
Composer examples at http://getcomposer.org/doc/00-intro.md use
/usr/local/bin for installing Composer globally, so let's use that
path as well instead of /usr/bin.
2012-12-11 15:43:30 +13:00
stojg
efa9ff9b08 API: Queries added by DataList::addInnerJoin() and DataList::leftJoin() come after the base joins, not before.
This bug will surface when using the ORM and adding an join to DataList
where a DataObject inherits another DataObject.

If you for example want to restrict the number of pages that only have a
related Staff object:

    $list = DataList::create('Page')
		->InnerJoin('Staff', '"Staff"."ID" = "Page"."StaffID");

This will create a SQL query where the INNER JOIN is before the
LEFT JOIN of Page and SiteTree in the resulting SQL string. In MySQL
and PostgreSQL this will create an invalid query.

This patch solves the problem by sorting the joins.
2012-12-11 11:04:29 +13:00
Ingo Schommer
1e0b0e7f56 More flexible Behat steps for HTML fields 2012-12-10 15:39:20 +01:00
Ingo Schommer
b15b5cd115 Ability to replace entire content in HTMLEditorField JS API 2012-12-10 15:39:15 +01:00
Ingo Schommer
3c0bd405a1 Removed @stable workarounds from composer docs
No longer necessary since we only add the @stable markers
for release tags, and remove them for release branches again.
2012-12-07 00:41:03 +01:00
Simon Welsh
aadefbb641 Sort lists that check ordering of results
These tests would randomly fail, mostly on Postgres, as the result
is an unordered set, not the ordered set expected.
2012-12-07 08:45:52 +13:00
Simon Welsh
5ca000d0a5 Correct routing rule block indentation 2012-12-07 08:15:53 +13:00
Ingo Schommer
f78f1cb254 Merge pull request #998 from drzax/validation-exception-bugfix
BUGFIX Make sure a message is set on ValidationException objects.
2012-12-06 05:52:34 -08:00
Ingo Schommer
9152387c92 Fixed GridField button alignment (regression from a9cbea34)
The text-indent: 9999px was relying on text-align: right to function. Because it was left-aligned, text showed below the icon graphic.
The width of the button column was constrainted to 40px,
which first of all didn't fit the two icons properly,
but also made the big assumption that we never have more than two.
The new width: auto setting means that the column might be a bit
longer than desired, but at least it doesn't cut off icons
or wrap them into multiple lines unnecessarily.

Thanks to ARNHOE for starting this patch.
2012-12-06 14:50:27 +01:00
Simon Elvery
205ee42110 BUGFIX Make sure a message is set on ValidationException objects. 2012-12-05 12:18:36 +10:00
Ingo Schommer
ab260d4913 Upgraded jQuery UI from 1.9.1 to 1.9.2 (fixes #8062) 2012-12-04 16:05:48 +01:00
Ingo Schommer
0be51a9321 BUG Fix ModelAdmin search (fixes #8052)
Broken by jQuery UI ajax behaviour in tabs, which compares
URLs to determine if the tab needs to be loaded via ajax.
This was always a brittle solution, and now broke alongside
our upgrade to jQuery UI 1.9 (specifically, with 2657a275).

The ajax behaviour is now globally disabled in favour of
having '.cms-panel-link' behaviour on the tabs, which
was already in place.
2012-12-04 14:28:36 +01:00
Ingo Schommer
0eab45392e Merge pull request #962 from chillu/pulls/buildtools
Updated docs to fit new 'buildtools' workflow
2012-12-04 01:24:35 -08:00
Ingo Schommer
4a0099e049 Merge pull request #995 from nyeholt/tab_hashlink_bug
BUG Rewrite hashlinks failing on empty a tags
2012-12-04 00:50:10 -08:00
Will Rossiter
100ad658db Email doc formatting
Workaround markdown parser throwing a fit with code straight after list.
2012-12-04 20:00:09 +13:00
Will Rossiter
bf67679155 Fix typo in email docs. 2012-12-04 19:56:36 +13:00
Will Rossiter
4cb81dafdf Fix typo with setTemplate() rss docs. 2012-12-04 19:54:26 +13:00
Marcus Nyeholt
1a4b245e84 BUG Fix rewriteHashlinks in TabSet
As per commit 3478813, check for presence of href before matching
2012-12-04 16:00:40 +11:00
Marcus Nyeholt
34788130ef BUG Rewrite hashlinks failing on empty a tags
Check for presence of href in _a_ tags before trying to .match them to
prevent null pointer errors.

Some external JS libs (eg tag-it) use <ul><a> structures which get matched
and break

(fixes regression introduced by ff39f9ad38)
2012-12-04 15:47:14 +11:00
Simon Welsh
9106e41498 Fix related to ModelAdmin links 2012-12-01 11:57:07 +13:00
Ingo Schommer
3f67404a8a Revert "BUGFIX: ArrayList now discards keys of the array passed in and keeps the numerically indexed array sequential."
This reverts commit b6017a7c90.
It breaks SelectionGroup, and its most prominent usage,
the "add page" dialog.
2012-11-30 14:24:03 +01:00
Ingo Schommer
78015ea3cf Merge pull request #985 from ARNHOE/3.0
SummaryFields doesn't change Title of Field
2012-11-30 01:01:55 -08:00
ARNHOE
8590bec1a9 SummaryFields doesn't change Title of Field
$field_labels does for me.
2012-11-30 09:53:01 +01:00
Will Rossiter
69dffd9b86 Merge pull request #982 from zoao/3.0
More fluent API.
2012-11-29 20:06:01 -08:00
João Martins
cc3e500f82 return $this, for do things like this: new DropdownField('XPTOName', 'XPTO Label', XPTOModel::get()->map("ID", "Name")->unshift(0,'- Select -'))
This does not break anything and makes things more natural
2012-11-30 01:37:36 +00:00
Ingo Schommer
7db1d619e8 Merge pull request #981 from ARNHOE/3.0
MINOR: Forgot Apostrophe in comment
2012-11-29 03:17:17 -08:00