Skip to content

Commit 53f57b6

Browse files
committed
#71 - editing default hardware definition allowed. Commented a block of code that I think it is not necessary. Need to be tested properly.
1 parent 5553913 commit 53f57b6

File tree

1 file changed

+34
-33
lines changed

1 file changed

+34
-33
lines changed

src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/lists/form/HardwareFormPage.java

+34-33
Original file line numberDiff line numberDiff line change
@@ -173,39 +173,40 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
173173
// Editing one
174174
log.debug("Editing existing hardware object.");
175175

176-
if (facade.isDefault(hardwareId)) {
177-
178-
if (researchGroupId != CoreConstants.DEFAULT_ITEM_ID) {
179-
// new hardware
180-
Hardware newHw = new Hardware();
181-
newHw.setDefaultNumber(0);
182-
newHw.setDescription(hardware.getDescription());
183-
newHw.setTitle(hardware.getTitle());
184-
newHw.setType(hardware.getType());
185-
int newId = facade.create(newHw);
186-
HardwareGroupRel rel = facade.getGroupRel(hardwareId, researchGroupId);
187-
// delete old rel, create new one
188-
HardwareGroupRelId newRelId = new HardwareGroupRelId();
189-
HardwareGroupRel newRel = new HardwareGroupRel();
190-
newRelId.setHardwareId(newId);
191-
newRelId.setResearchGroupId(researchGroupId);
192-
newRel.setId(newRelId);
193-
newRel.setHardware(newHw);
194-
newRel.setResearchGroup(group);
195-
facade.deleteGroupRel(rel);
196-
facade.createGroupRel(newRel);
197-
} else {
198-
if (!facade.hasGroupRel(hardwareId) && facade.canDelete(hardwareId)) {
199-
facade.update(hardware);
200-
} else {
201-
getFeedback().error(ResourceUtils.getString("text.itemInUse"));
202-
this.setEnabled(true);
203-
return;
204-
}
205-
}
206-
} else {
207-
facade.update(hardware);
208-
}
176+
// if (facade.isDefault(hardwareId)) {
177+
//
178+
// if (researchGroupId != CoreConstants.DEFAULT_ITEM_ID) {
179+
// // new hardware
180+
// Hardware newHw = new Hardware();
181+
// newHw.setDefaultNumber(0);
182+
// newHw.setDescription(hardware.getDescription());
183+
// newHw.setTitle(hardware.getTitle());
184+
// newHw.setType(hardware.getType());
185+
// int newId = facade.create(newHw);
186+
// HardwareGroupRel rel = facade.getGroupRel(hardwareId, researchGroupId);
187+
// // delete old rel, create new one
188+
// HardwareGroupRelId newRelId = new HardwareGroupRelId();
189+
// HardwareGroupRel newRel = new HardwareGroupRel();
190+
// newRelId.setHardwareId(newId);
191+
// newRelId.setResearchGroupId(researchGroupId);
192+
// newRel.setId(newRelId);
193+
// newRel.setHardware(newHw);
194+
// newRel.setResearchGroup(group);
195+
// facade.deleteGroupRel(rel);
196+
// facade.createGroupRel(newRel);
197+
// } else {
198+
// if (!facade.hasGroupRel(hardwareId) && facade.canDelete(hardwareId)) {
199+
// facade.update(hardware);
200+
// } else {
201+
// getFeedback().error(ResourceUtils.getString("text.itemInUse"));
202+
// this.setEnabled(true);
203+
// return;
204+
// }
205+
// }
206+
// } else {
207+
//
208+
// }
209+
facade.update(hardware);
209210
} else {
210211

211212
// Creating new

0 commit comments

Comments
 (0)