tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.6' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2018-03-14 13:53:37 +00:00
commit 2c6f588785
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
javascript/TreeDropdownField.js
View File

@ -47,13 +47,15 @@
// XMLHttpRequest // XMLHttpRequest
CurrentXhr: null, CurrentXhr: null,
onmatch: function() { onadd: function() {
this.append( this.append(
'<span class="treedropdownfield-title"></span>' + '<span class="treedropdownfield-title"></span>' +
'<div class="treedropdownfield-toggle-panel-link"><a href="#" class="ui-icon ui-icon-triangle-1-s"></a></div>' + '<div class="treedropdownfield-toggle-panel-link"><a href="#" class="ui-icon ui-icon-triangle-1-s"></a></div>' +
'<div class="treedropdownfield-panel"><div class="tree-holder"></div></div>' '<div class="treedropdownfield-panel"><div class="tree-holder"></div></div>'
); );
},
onmatch: function() {
var linkTitle = strings.openLink; var linkTitle = strings.openLink;
if(linkTitle) this.find("treedropdownfield-toggle-panel-link a").attr('title', linkTitle); if(linkTitle) this.find("treedropdownfield-toggle-panel-link a").attr('title', linkTitle);
if(this.data('title')) this.setTitle(this.data('title')); if(this.data('title')) this.setTitle(this.data('title'));
@ -334,7 +336,7 @@
}); });
$('.TreeDropdownField.searchable').entwine({ $('.TreeDropdownField.searchable').entwine({
onmatch: function() { onadd: function() {
this._super(); this._super();
var title = ss.i18n._t('TreeDropdownField.ENTERTOSEARCH'); var title = ss.i18n._t('TreeDropdownField.ENTERTOSEARCH');
this.find('.treedropdownfield-panel').prepend( this.find('.treedropdownfield-panel').prepend(

7
model/ManyManyList.php
View File

@ -188,6 +188,13 @@ class ManyManyList extends RelationList {
* Add an item to this many_many relationship * Add an item to this many_many relationship
* Does so by adding an entry to the joinTable. * Does so by adding an entry to the joinTable.
* *
* Can also be used to update an already existing joinTable entry
*
* Example:
*
* $manyManyList->add($recordID, array("ExtraField"=>"value"));
*
*
* @throws InvalidArgumentException * @throws InvalidArgumentException
* @throws Exception * @throws Exception
* *