Skip to content

Commit 0954293

Browse files
committed
vectorial enabled/disabled icons for retention policies
1 parent 02f6f59 commit 0954293

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/data/RetentionPoliciesDS.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.logicaldoc.gui.common.client.data;
22

33
import com.smartgwt.client.data.DataSource;
4-
import com.smartgwt.client.data.fields.DataSourceImageField;
4+
import com.smartgwt.client.data.fields.DataSourceBooleanField;
55
import com.smartgwt.client.data.fields.DataSourceTextField;
66

77
/**
@@ -22,7 +22,7 @@ public RetentionPoliciesDS() {
2222
DataSourceTextField dateOption = new DataSourceTextField("dateOption");
2323
DataSourceTextField template = new DataSourceTextField("template");
2424
DataSourceTextField action = new DataSourceTextField("action");
25-
DataSourceImageField enabled = new DataSourceImageField("eenabled");
25+
DataSourceBooleanField enabled = new DataSourceBooleanField("eenabled");
2626

2727
setFields(id, name, days, dateOption, template, action, enabled);
2828
setDataURL("data/retentionpolicies.xml");

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/RetentionPoliciesPanel.java

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
import com.logicaldoc.gui.common.client.i18n.I18N;
77
import com.logicaldoc.gui.common.client.util.GridUtil;
88
import com.logicaldoc.gui.common.client.util.LD;
9-
import com.logicaldoc.gui.common.client.util.Util;
109
import com.logicaldoc.gui.common.client.widgets.HTMLPanel;
1110
import com.logicaldoc.gui.common.client.widgets.InfoPanel;
11+
import com.logicaldoc.gui.common.client.widgets.grid.EnabledListGridField;
1212
import com.logicaldoc.gui.common.client.widgets.grid.RefreshableListGrid;
1313
import com.logicaldoc.gui.frontend.client.administration.AdminPanel;
1414
import com.logicaldoc.gui.frontend.client.impex.folders.ImportFolderDetailsPanel;
1515
import com.logicaldoc.gui.frontend.client.services.RetentionPoliciesService;
1616
import com.smartgwt.client.data.AdvancedCriteria;
1717
import com.smartgwt.client.data.Record;
1818
import com.smartgwt.client.types.Alignment;
19-
import com.smartgwt.client.types.ListGridFieldType;
2019
import com.smartgwt.client.types.OperatorId;
2120
import com.smartgwt.client.types.SelectionStyle;
2221
import com.smartgwt.client.widgets.Canvas;
@@ -91,14 +90,7 @@ public void onDraw() {
9190

9291
ListGridField action = prepareActionField();
9392

94-
ListGridField enabled = new ListGridField(EENABLED, " ", 24);
95-
enabled.setType(ListGridFieldType.IMAGE);
96-
enabled.setCanSort(false);
97-
enabled.setAlign(Alignment.CENTER);
98-
enabled.setShowDefaultContextMenu(false);
99-
enabled.setImageURLPrefix(Util.imagePrefix());
100-
enabled.setImageURLSuffix(".gif");
101-
enabled.setCanFilter(false);
93+
ListGridField enabled = new EnabledListGridField();
10294

10395
list = new RefreshableListGrid();
10496
list.setEmptyMessage(I18N.message("notitemstoshow"));
@@ -231,31 +223,29 @@ public void onSuccess(Void result) {
231223

232224
MenuItem enable = new MenuItem();
233225
enable.setTitle(I18N.message("enable"));
226+
enable.setEnabled(!rec.getAttributeAsBoolean("eenabled"));
234227
enable.addClickHandler(event -> RetentionPoliciesService.Instance.get()
235228
.changeStatus(Long.parseLong(rec.getAttributeAsString("id")), true, new DefaultAsyncCallback<>() {
236229
@Override
237230
public void onSuccess(Void result) {
238-
rec.setAttribute(EENABLED, "0");
231+
rec.setAttribute(EENABLED, true);
239232
list.refreshRow(list.getRecordIndex(rec));
240233
}
241234
}));
242235

243236
MenuItem disable = new MenuItem();
244237
disable.setTitle(I18N.message("disable"));
238+
disable.setEnabled(rec.getAttributeAsBoolean("eenabled"));
245239
disable.addClickHandler(event -> RetentionPoliciesService.Instance.get()
246240
.changeStatus(Long.parseLong(rec.getAttributeAsString("id")), false, new DefaultAsyncCallback<>() {
247241
@Override
248242
public void onSuccess(Void result) {
249-
rec.setAttribute(EENABLED, "2");
243+
rec.setAttribute(EENABLED, false);
250244
list.refreshRow(list.getRecordIndex(rec));
251245
}
252246
}));
253247

254-
if ("0".equals(rec.getAttributeAsString(EENABLED)))
255-
contextMenu.setItems(disable, delete);
256-
else
257-
contextMenu.setItems(enable, delete);
258-
248+
contextMenu.setItems(enable, disable, delete);
259249
contextMenu.showContextMenu();
260250
}
261251

@@ -293,6 +283,7 @@ public void updateRecord(GUIRetentionPolicy policy) {
293283
rec.setAttribute(TEMPLATE, policy.getTemplateName() != null ? policy.getTemplateName() : null);
294284
rec.setAttribute("position", "" + policy.getPosition());
295285
rec.setAttribute(ACTION, "" + policy.getAction());
286+
rec.setAttribute("eenabled", policy.getEnabled() == 1);
296287

297288
list.refreshRow(list.getRecordIndex(rec));
298289
}
@@ -303,7 +294,7 @@ public void refresh() {
303294
details = SELECT_POLICY;
304295
detailsContainer.setMembers(details);
305296
}
306-
297+
307298
@Override
308299
public boolean equals(Object other) {
309300
return super.equals(other);

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/security/ldap/LDAPServersPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void onDraw() {
6262
ListGridField id = new ListGridField("id", 50);
6363
id.setHidden(true);
6464
id.setCellFormatter(new EnabledCellFormatter());
65-
65+
6666
ListGridField url = new ListGridField("url", I18N.message("server"), 300);
6767
url.setCanFilter(true);
6868
url.setWidth("*");

0 commit comments

Comments
 (0)