Skip to content

Commit 69fca46

Browse files
committed
[smarcet]
* fix on languages for CFP bio form
1 parent 703cf3d commit 69fca46

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

summit/code/forms/SpeakerForm.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ public function loadDataFrom($data, $mergeStrategy = 0, $fieldList = null)
196196
if(empty($speaker->TwitterName)) $this->fields->fieldByName('TwitterName')->setValue($speaker->Member()->TwitterName);
197197
}
198198

199-
$this->fields->fieldByName('Expertise')->setValue(implode(',',$speaker->AreasOfExpertise()->map('ID','Expertise')->toArray()));
200-
$this->fields->fieldByName('Language')->setValue(implode(',',$speaker->Languages()->map('ID','Language')->toArray()));
199+
$this->fields->fieldByName('Expertise')->setValue(implode(',', $speaker->AreasOfExpertise()->map('ID','Expertise')->toArray()));
200+
$this->fields->fieldByName('Language')->setValue(implode(',', $speaker->Languages()->map('ID','Name')->toArray()));
201201

202202
$country_array = array();
203203
foreach ($speaker->TravelPreferences() as $pref_country) {
@@ -259,8 +259,11 @@ public function saveInto(DataObjectInterface $dataObject, $fieldList = null) {
259259

260260
$language = $this->fields->fieldByName("Language")->Value();
261261
$speaker->Languages()->removeAll();
262-
foreach(explode(',',$language) as $lang_id) ;
263-
$speaker->Languages()->add($lang_id);
262+
foreach(explode(',',$language) as $lang_name) {
263+
$lang = Language::get()->where(sprintf("LOWER(Name) = '%s'", strtolower($lang_name)))->first();
264+
if(!$lang) continue;
265+
$speaker->Languages()->add($lang);
266+
}
264267

265268
$link_ids = [];
266269
for($i = 1 ; $i <= 5 ; $i++ ){

summit/code/pages/PresentationPage.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ public function preview(SS_HTTPRequest $r)
345345
))->renderWith(array('PresentationPage_preview', 'PresentationPage'));
346346
}
347347

348-
349348
/**
350349
* Action that shows the presentation details, readonly
351350
* @param $r SS_HTTPRequest

summit/javascript/speaker-form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $(document).ready(function(){
8080
minlength: 3,
8181
name: 'languages',
8282
displayKey: 'name',
83-
valueKey: 'id',
83+
valueKey: 'name',
8484
source: languages.ttAdapter()
8585
}
8686
]

0 commit comments

Comments
 (0)