test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 19:57:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-9044 Generated column in table is not editable if Table editable = false

Browse Source
This commit is contained in:
Yuriy Artamonov 2017-05-04 16:59:21 +04:00
parent b77968c5ee
commit bf9b9814d1
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopAbstractField.java
View File

@ -225,8 +225,8 @@ public abstract class DesktopAbstractField<C extends JComponent> extends Desktop
this.editable = editable;
boolean parentEditable = true;
if (parent instanceof Editable) {
parentEditable = ((Editable) parent).isEditable();
if (parent instanceof ChildEditableController) {
parentEditable = ((ChildEditableController) parent).isEditable();
}
boolean finalEditable = parentEditable && editable;

6
modules/gui/src/com/haulmont/cuba/gui/components/Component.java
View File

@ -507,6 +507,12 @@ public interface Component {
void setEditable(boolean editable);
}
/**
* Component that manages editable property of child components.
*/
interface ChildEditableController extends Editable {
}
/**
* Event that is fired when "editable" property of Editable component has been changed.
*/

2
modules/gui/src/com/haulmont/cuba/gui/components/FieldGroup.java
View File

@ -29,7 +29,7 @@ import java.util.Map;
*/
public interface FieldGroup extends Component, Component.BelongToFrame, Component.HasCaption, Component.HasIcon,
Component.HasBorder, Component.Editable, Component.Validatable,
Component.EditableChangeNotifier {
Component.EditableChangeNotifier, Component.ChildEditableController {
String NAME = "fieldGroup";
/**

4
modules/web/src/com/haulmont/cuba/web/gui/components/WebAbstractField.java
View File

@ -269,8 +269,8 @@ public abstract class WebAbstractField<T extends com.vaadin.ui.AbstractField>
this.editable = editable;
boolean parentEditable = true;
if (parent instanceof Editable) {
parentEditable = ((Editable) parent).isEditable();
if (parent instanceof ChildEditableController) {
parentEditable = ((ChildEditableController) parent).isEditable();
}
boolean finalEditable = parentEditable && editable;