Commit e14fa130 authored by Nugraha, Sigit's avatar Nugraha, Sigit
Browse files

Clean up and set default group dialect

parent 98d4c446
Pipeline #15163 passed with stage
in 1 minute and 58 seconds
...@@ -122,7 +122,7 @@ public class GroupForm extends FormLayout implements Translatable { ...@@ -122,7 +122,7 @@ public class GroupForm extends FormLayout implements Translatable {
final Language selectedLanguage = languageComboBox.getValue(); final Language selectedLanguage = languageComboBox.getValue();
groupDTO.setLanguage( selectedLanguage.getIso3() ); groupDTO.setLanguage( selectedLanguage.getIso3() );
groupDTO.setDialect( selectedLanguage.getStudyDialect() ); groupDTO.setDialect( "gesisGroup32" );
if( groupDTO.getId() == null ) { if( groupDTO.getId() == null ) {
final StudyGroup newStudyGroup = creationService.createNewStudyGroup(groupDTO.getName(), groupDTO.getDescription()); final StudyGroup newStudyGroup = creationService.createNewStudyGroup(groupDTO.getName(), groupDTO.getDescription());
......
package org.gesis.stardat.ui.admin.layout; package org.gesis.stardat.ui.admin.layout;
import java.util.ArrayList; import com.vaadin.icons.VaadinIcons;
import java.util.List; import com.vaadin.shared.ui.ContentMode;
import java.util.Locale; import com.vaadin.shared.ui.ValueChangeMode;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.Grid;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.themes.ValoTheme;
import org.gesis.stardat.entity.StudyGroup; import org.gesis.stardat.entity.StudyGroup;
import org.gesis.stardat.service.GroupService; import org.gesis.stardat.service.GroupService;
import org.gesis.stardat.service.StudyGroupService; import org.gesis.stardat.service.StudyGroupService;
...@@ -17,13 +20,9 @@ import org.vaadin.viritin.fields.MTextField; ...@@ -17,13 +20,9 @@ import org.vaadin.viritin.fields.MTextField;
import org.vaadin.viritin.label.MLabel; import org.vaadin.viritin.label.MLabel;
import org.vaadin.viritin.layouts.MCssLayout; import org.vaadin.viritin.layouts.MCssLayout;
import com.vaadin.icons.VaadinIcons; import java.util.ArrayList;
import com.vaadin.shared.ui.ContentMode; import java.util.List;
import com.vaadin.shared.ui.ValueChangeMode; import java.util.Locale;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.Grid;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.themes.ValoTheme;
public class ManageStudyGroupLayout extends MCssLayout implements Translatable { public class ManageStudyGroupLayout extends MCssLayout implements Translatable {
...@@ -108,26 +107,6 @@ public class ManageStudyGroupLayout extends MCssLayout implements Translatable { ...@@ -108,26 +107,6 @@ public class ManageStudyGroupLayout extends MCssLayout implements Translatable {
private void initHints() { private void initHints() {
grid.setDescription(i18n.get("ManageUserLayout.table.description")); grid.setDescription(i18n.get("ManageUserLayout.table.description"));
// HeaderRow headerRow = grid.getDefaultHeaderRow();
// headerRow.getCell( "username" )
// .setHtml( "<div title='" + i18n.get( "ManageUserLayout" + ".table.column0.hint1" ) + " "
// + i18n.get( "manage.user.username" ) + " "
// + i18n.get( "ManageUserLayout" + ".table.column0.hint2" ) + "'>"
// + i18n.get( "manage.user.username" ) + "</div>" );
//
// headerRow.getCell( "firstName" )
// .setHtml( "<div title='" + i18n.get( "ManageUserLayout" + ".table.column0.hint1" ) + " "
// + i18n.get( "manage.user.firstName" ) + " "
// + i18n.get( "ManageUserLayout" + ".table.column0.hint2" ) + "'>"
// + i18n.get( "manage.user.firstName" ) + "</div>" );
//
// headerRow.getCell( "lastName" )
// .setHtml( "<div title='" + i18n.get( "ManageUserLayout" + ".table.column0.hint1" ) + " "
// + i18n.get( "manage.user.lastName" ) + " "
// + i18n.get( "ManageUserLayout" + ".table.column0.hint2" ) + "'>"
// + i18n.get( "manage.user.lastName" ) + "</div>" );
} }
public void updateList() { public void updateList() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment