mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts: lang/cs.yml lang/sk.yml
This commit is contained in:
commit
e07f80014c
@ -105,7 +105,10 @@
|
||||
SiblingIDs: siblingIDs
|
||||
},
|
||||
success: function() {
|
||||
$('.cms-edit-form :input[name=ParentID]').val(newParentID);
|
||||
// We only need to update the ParentID if the current page we're on is the page being moved
|
||||
if ($('.cms-edit-form :input[name=ID]').val() == nodeID) {
|
||||
$('.cms-edit-form :input[name=ParentID]').val(newParentID);
|
||||
}
|
||||
self.updateNodesFromServer([nodeID]);
|
||||
},
|
||||
statusCode: {
|
||||
|
@ -301,7 +301,11 @@ class ClassInfo {
|
||||
* @return string
|
||||
*/
|
||||
public static function table_for_object_field($candidateClass, $fieldName) {
|
||||
if(!$candidateClass || !$fieldName || !is_subclass_of($candidateClass, 'DataObject')) {
|
||||
if(!$candidateClass
|
||||
|| !$fieldName
|
||||
|| !class_exists($candidateClass)
|
||||
|| !is_subclass_of($candidateClass, 'DataObject')
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -3,7 +3,7 @@ summary: Modify the data model without using subclasses.
|
||||
|
||||
# Extending DataObjects
|
||||
|
||||
You can add properties and methods to existing [api:DataObjects]s like [api:Member] without hacking core code or sub
|
||||
You can add properties and methods to existing [api:DataObject]s like [api:Member] without hacking core code or sub
|
||||
classing by using [api:DataExtension]. See the [Extending SilverStripe](../extending) guide for more information on
|
||||
[api:DataExtension].
|
||||
|
||||
|
@ -17,11 +17,11 @@ top level menu with a nested second level using the `Menu` loop and a `Children`
|
||||
|
||||
<% if $LinkOrSection == section %>
|
||||
<% if $Children %>
|
||||
<li><ul class="secondary">
|
||||
<ul class="secondary">
|
||||
<% loop $Children %>
|
||||
<li class="$LinkingMode"><a href="$Link">$MenuTitle</a></li>
|
||||
<% end_loop %>
|
||||
</ul></li>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% end_if %>
|
||||
</li>
|
||||
@ -31,4 +31,4 @@ top level menu with a nested second level using the `Menu` loop and a `Children`
|
||||
## Related
|
||||
|
||||
* [Template Syntax](../syntax)
|
||||
* [Common Variables](../common_variables)
|
||||
* [Common Variables](../common_variables)
|
||||
|
@ -67,7 +67,7 @@ the `getConfig()` method on `GridField`.
|
||||
$fields = parent::getCMSFields();
|
||||
|
||||
$fields->addFieldToTab('Root.Pages',
|
||||
$grid = GridField('Pages', 'All pages', SiteTree::get())
|
||||
$grid = new GridField('Pages', 'All pages', SiteTree::get())
|
||||
);
|
||||
|
||||
// GridField configuration
|
||||
|
@ -23,7 +23,7 @@ the [api:Extension] class for non DataObject subclasses (such as [api:Controller
|
||||
|
||||
public function SayHi() {
|
||||
// $this->owner refers to the original instance. In this case a `Member`.
|
||||
return "Hi ". $this->owner->Name;
|
||||
return "Hi " . $this->owner->Name;
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,7 +80,7 @@ $has_one etc.
|
||||
|
||||
public function SayHi() {
|
||||
// $this->owner refers to the original instance. In this case a `Member`.
|
||||
return "Hi ". $this->owner->Name;
|
||||
return "Hi " . $this->owner->Name;
|
||||
}
|
||||
}
|
||||
|
||||
|
13
docs/en/04_Changelogs/3.1.15.md
Normal file
13
docs/en/04_Changelogs/3.1.15.md
Normal file
@ -0,0 +1,13 @@
|
||||
# 3.1.15
|
||||
|
||||
This release resolves issues with compatibility with PHP 5.3.3 introduced in 3.1.14
|
||||
|
||||
<!--- Changes below this line will be automatically regenerated -->
|
||||
|
||||
## Change Log
|
||||
|
||||
### Bugfixes
|
||||
|
||||
* 2015-09-17 [e64d73c](https://github.com/silverstripe/silverstripe-framework/commit/e64d73c1f741399412b6015f6602ed707b2e9778) Fix ClassInfo::table_for_object_field (Damian Mooyman)
|
||||
* 2015-09-09 [06cc185](https://github.com/silverstripe/silverstripe-framework/commit/06cc18526a1f63b8bb16809e23f2eb17ade7a85e) UploadField error when attempting to attach non-existent file IDs (Loz Calver)
|
||||
* 2015-09-07 [96d20bc](https://github.com/silverstripe/silverstripe-framework/commit/96d20bc1809c731e3e78b7c5248282c8771f3097) Fix missing framework/admin/tests (Damian Mooyman)
|
@ -6,6 +6,7 @@ The core committers team is reviewed approximately annually, new members are add
|
||||
* [Daniel Hensby](https://github.com/dhensby)
|
||||
* [Hamish Friedlander](https://github.com/hafriedlander)
|
||||
* [Ingo Schommer](https://github.com/chillu)
|
||||
* [Jono Menz](https://github.com/jonom)
|
||||
* [Loz Calver](https://github.com/kinglozzer)
|
||||
* [Sam Minnée](https://github.com/sminnee)
|
||||
* [Sean Harvey](https://github.com/halkyon/)
|
||||
|
@ -292,6 +292,8 @@ cs:
|
||||
FROMWEB: 'Z webu'
|
||||
FindInFolder: 'Hledat ve složce'
|
||||
IMAGEALT: 'Alternativní text (alt)'
|
||||
IMAGEALTTEXT: 'Alternativní text (alt) - ukáže se, když obrázek nemúže být zobrazen'
|
||||
IMAGEALTTEXTDESC: 'Zobrazeno na obrazovce, anebo když obrázek nemůže být zobrazen'
|
||||
IMAGEDIMENSIONS: Rozměry
|
||||
IMAGEHEIGHTPX: Výška
|
||||
IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku'
|
||||
@ -326,9 +328,11 @@ cs:
|
||||
DELETED: Smazáno.
|
||||
DropdownBatchActionsDefault: Akcie
|
||||
HELP: Nápověda
|
||||
PAGETYPE: 'Typ stránky:'
|
||||
PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.'
|
||||
PERMALREADY: 'Omlouvám se, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže.'
|
||||
PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, zadejte vaše přihlošovací údaje dole, prosím.'
|
||||
PLEASESAVE: 'Uložte stránku, prosím. Tato stránka nemůže být aktualizována, protože ještě nebyla uložena.'
|
||||
PreviewButton: Náhled
|
||||
REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.'
|
||||
SAVEDUP: Uloženo.
|
||||
|
@ -292,6 +292,8 @@ lt:
|
||||
FROMWEB: 'Iš interneto'
|
||||
FindInFolder: 'Rasti kataloge'
|
||||
IMAGEALT: 'Alternatyvus tekstas (alt)'
|
||||
IMAGEALTTEXT: 'Alternatyvus tekstas (alt) - rodomas, jeigu nepavyko parodyti paveikslėlio'
|
||||
IMAGEALTTEXTDESC: 'Rodomas, jeigu nepavyko parodyti paveikslėlio'
|
||||
IMAGEDIMENSIONS: Matmenys
|
||||
IMAGEHEIGHTPX: Aukštis
|
||||
IMAGETITLE: 'Pavadinimo tekstas (tooltip) - papildomai informacijai apie paveikslėlį'
|
||||
@ -326,9 +328,11 @@ lt:
|
||||
DELETED: Ištrinta.
|
||||
DropdownBatchActionsDefault: Veiksmai
|
||||
HELP: Pagalba
|
||||
PAGETYPE: 'Puslapio tipas:'
|
||||
PERMAGAIN: 'Jūs atsijungėte. Norėdami vėl prisijungti, įveskite savo duomenis į žemiau esančius laukelius.'
|
||||
PERMALREADY: 'Deja, bet Jūs negalite patekti į šią TVS dalį. Jeigu norite prisijungti kitu vartotoju, tai atlikite žemiau.'
|
||||
PERMDEFAULT: 'Jūs turite būti prisijungę, norėdami pasiekti administravimo zoną; prašome suvesti prisijungimo duomenis į žemiau esančius laukelius.'
|
||||
PLEASESAVE: 'Prašome išsaugoti puslapį: Šis puslapis negali būti atnaujintas, nes jis dar nėra išsaugotas.'
|
||||
PreviewButton: Peržiūra
|
||||
REORGANISATIONSUCCESSFUL: 'Puslapių medis pertvarkytas sėkmingai.'
|
||||
SAVEDUP: Išsaugota.
|
||||
|
@ -292,6 +292,8 @@ sk:
|
||||
FROMWEB: 'Z webu'
|
||||
FindInFolder: 'Vyhľadať v priečinku'
|
||||
IMAGEALT: 'Atlernatívny text (alt)'
|
||||
IMAGEALTTEXT: 'Atlernatívny text (alt) - zobrazí sa ak obrázok nemože byť zobrazený '
|
||||
IMAGEALTTEXTDESC: 'Zobrazí sa na obrazovke, ak obrázok nemôže byť zobrazený'
|
||||
IMAGEDIMENSIONS: Rozmery
|
||||
IMAGEHEIGHTPX: Výška
|
||||
IMAGETITLE: 'Text titulky (tooltip) - pre doplňujúce informácie o obrázku'
|
||||
@ -326,9 +328,11 @@ sk:
|
||||
DELETED: Zmazané.
|
||||
DropdownBatchActionsDefault: Akcie
|
||||
HELP: Pomoc
|
||||
PAGETYPE: 'Typ stránky:'
|
||||
PERMAGAIN: 'Boli ste odhlásený'
|
||||
PERMALREADY: 'Je mi ľúto, ale nemáte prístup k tejto časti CMS. Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie'
|
||||
PERMDEFAULT: 'Musíte byť prihlásený/á k prístupu do oblasti administrácie, zadajte vaše prihlasovacie údaje dole, prosím.'
|
||||
PLEASESAVE: 'Uložte stránku, prosím. Táto stránka nemôže byť aktualizovaná, pretože eště nebola uložená.'
|
||||
PreviewButton: Náhľad
|
||||
REORGANISATIONSUCCESSFUL: 'Strom webu bol reorganizovaný úspešne.'
|
||||
SAVEDUP: Uložené.
|
||||
|
Loading…
Reference in New Issue
Block a user