Skip to content

[FIX] Read default name from related model in OSelectionField #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pathob wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIX] Read default name from related model in OSelectionField #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions app/src/main/java/odoo/controls/OSelectionField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public class OSelectionField extends LinearLayout implements IOControlData,
private OColumn mCol;
private String mLabel;
private OModel mModel;
private OModel mRelModel;
private List<ODataRow> items = new ArrayList<>();
private ValueUpdateListener mValueUpdateListener = null;
// Controls
Expand Down Expand Up @@ -129,7 +130,11 @@ private void createRadioGroup() {
for (ODataRow label : items) {
RadioButton rdoBtn = new RadioButton(mContext);
rdoBtn.setLayoutParams(params);
rdoBtn.setText(label.getString(mModel.getDefaultNameColumn()));
if (mRelModel != null) {
rdoBtn.setText(label.getString(mRelModel.getDefaultNameColumn()));
} else {
rdoBtn.setText(label.getString(mModel.getDefaultNameColumn()));
}
if (textSize > -1) {
rdoBtn.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
}
Expand Down Expand Up @@ -357,7 +362,11 @@ else if (mValue instanceof Integer)
row = getRecordData((Integer) mValue);
}
if (row != null)
txvView.setText(row.getString(mModel.getDefaultNameColumn()));
if (mRelModel != null) {
txvView.setText(row.getString(mRelModel.getDefaultNameColumn()));
} else {
txvView.setText(row.getString(mModel.getDefaultNameColumn()));
}
if (txvView.getTag() != null) {
AlertDialog dialog = (AlertDialog) txvView.getTag();
dialog.dismiss();
Expand Down Expand Up @@ -479,13 +488,16 @@ public void setColumn(OColumn col) {
if (mCol != null && mLabel == null) {
mLabel = mCol.getLabel();
}

if (mCol != null && mModel != null) {
mRelModel = mModel.createInstance(mCol.getType());
}
}

private ODataRow getRecordData(int row_id) {
ODataRow row;
if (row_id > 0) {
OModel rel_model = mModel.createInstance(mCol.getType());
row = rel_model.browse(row_id);
row = mRelModel.browse(row_id);
} else {
row = items.get(0);
}
Expand Down Expand Up @@ -588,6 +600,10 @@ public void onReceive(Context context, Intent intent) {

public void setModel(OModel model) {
mModel = model;

if (mCol != null && mModel != null) {
mRelModel = mModel.createInstance(mCol.getType());
}
}

public static List<ODataRow> getRecordItems(OModel model, OColumn column, Bundle formData) {
Expand Down