Skip to content

Commit 5b5c34f

Browse files
committed
code fixes
1 parent 9890bcd commit 5b5c34f

File tree

10 files changed

+32
-22
lines changed

10 files changed

+32
-22
lines changed

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/grid/RunningListGridField.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,24 @@
1212
*/
1313
public class RunningListGridField extends ColoredListGridField {
1414

15+
private static final String RUNNING = "running";
16+
1517
public RunningListGridField() {
16-
super("running", " ", 30);
18+
super(RUNNING, " ", 30);
1719
setCanFilter(true);
1820
setCanSort(true);
1921
setCellFormatter((value, rec, rowNum, colNum) -> formatStatusIconCell(rec));
2022
}
2123

2224
private String formatStatusIconCell(ListGridRecord rec) {
2325
String color = rec.getAttributeAsString(colorFieldName);
24-
Boolean running = rec.getAttributeAsBoolean("running");
26+
Boolean running = rec.getAttributeAsBoolean(RUNNING);
2527
if (running == null)
2628
return "";
2729

2830
String content = "<div style='display: flex; text-align: center; justify-content: center;'>";
2931
if (Boolean.TRUE.equals(running)) {
30-
content += AwesomeFactory.getIconButtonHTML("cog", null, "running", color, "spin", null);
32+
content += AwesomeFactory.getIconButtonHTML("cog", null, RUNNING, color, "spin", null);
3133
} else {
3234
content += AwesomeFactory.getIconButtonHTML("cog", null, "idle", color, null);
3335
}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/dashboard/messages/MessagePriorityListGridField.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
*/
1717
public class MessagePriorityListGridField extends ListGridField {
1818

19+
private static final String PRIORITY = "priority";
20+
1921
public MessagePriorityListGridField() {
20-
super("priority", I18N.message("priority"));
22+
super(PRIORITY, I18N.message(PRIORITY));
2123
setCanFilter(true);
2224
setCanSort(true);
2325
setAlign(Alignment.CENTER);
@@ -28,7 +30,7 @@ public MessagePriorityListGridField() {
2830

2931
private String formatPriorityIconCell(ListGridRecord rec) {
3032
String content = "<div style='display: flex; text-align: center; justify-content: center;'>";
31-
int priority = rec.getAttributeAsInt("priority");
33+
int priority = rec.getAttributeAsInt(PRIORITY);
3234

3335
switch (priority) {
3436
case GUIMessage.PRIO_INFO:

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/BookmarksPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void onDraw() {
6868
list.setWidth100();
6969
list.setHeight100();
7070
list.setAutoFetchData(true);
71-
list.setFields(name, description);
71+
list.setFields(id, name, description);
7272
list.setDataSource(new BookmarksDS());
7373
list.setShowFilterEditor(true);
7474
list.setFilterOnKeypress(true);

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/TrashPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void onDraw() {
7676
list.setWidth100();
7777
list.setHeight100();
7878
list.setAutoFetchData(true);
79-
list.setFields(fileName, idField, customId, lastModified);
79+
list.setFields(id, fileName, idField, customId, lastModified);
8080
list.setSelectionType(SelectionStyle.MULTIPLE);
8181
list.setDataSource(new GarbageDS());
8282
list.setShowFilterEditor(true);

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/impex/archives/ArchiveStatusListGridField.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
*/
1818
public class ArchiveStatusListGridField extends ListGridField {
1919

20+
private static final String STATUS = "status";
21+
2022
public ArchiveStatusListGridField() {
21-
super("status", I18N.message("status"));
23+
super(STATUS, I18N.message(STATUS));
2224
setAutoFitWidth(true);
2325
setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
2426
setAlign(Alignment.CENTER);
@@ -29,7 +31,7 @@ public ArchiveStatusListGridField() {
2931

3032
private String formatStatusIconCell(ListGridRecord rec) {
3133
String content = "<div style='display: flex; text-align: center; justify-content: center;'>";
32-
Integer status = rec.getAttributeAsInt("status");
34+
Integer status = rec.getAttributeAsInt(STATUS);
3335
Integer mode = rec.getAttributeAsInt("mode");
3436
switch (status) {
3537
case GUIArchive.STATUS_OPEN:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class RetentionPoliciesPanel extends AdminPanel {
4040

4141
private static final String ACTION = "action";
4242

43-
private static final String EENABLED = "eenabled";
43+
private static final String ENABLED = "eenabled";
4444

4545
private static final String TEMPLATE = "template";
4646

@@ -223,12 +223,12 @@ public void onSuccess(Void result) {
223223

224224
MenuItem enable = new MenuItem();
225225
enable.setTitle(I18N.message("enable"));
226-
enable.setEnabled(!rec.getAttributeAsBoolean("eenabled"));
226+
enable.setEnabled(!rec.getAttributeAsBoolean(ENABLED));
227227
enable.addClickHandler(event -> RetentionPoliciesService.Instance.get()
228228
.changeStatus(Long.parseLong(rec.getAttributeAsString("id")), true, new DefaultAsyncCallback<>() {
229229
@Override
230230
public void onSuccess(Void result) {
231-
rec.setAttribute(EENABLED, true);
231+
rec.setAttribute(ENABLED, true);
232232
list.refreshRow(list.getRecordIndex(rec));
233233
}
234234
}));
@@ -240,7 +240,7 @@ public void onSuccess(Void result) {
240240
.changeStatus(Long.parseLong(rec.getAttributeAsString("id")), false, new DefaultAsyncCallback<>() {
241241
@Override
242242
public void onSuccess(Void result) {
243-
rec.setAttribute(EENABLED, false);
243+
rec.setAttribute(ENABLED, false);
244244
list.refreshRow(list.getRecordIndex(rec));
245245
}
246246
}));

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/reports/TicketsReport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ protected RefreshableListGrid createListGrid() {
130130
protected String getCellCSSText(ListGridRecord rec, int rowNum, int colNum) {
131131
if (Boolean.FALSE.equals(rec.getAttributeAsBoolean(VALID))
132132
|| Boolean.FALSE.equals(rec.getAttributeAsBoolean(ENABLED))) {
133-
return Boolean.TRUE.equals(rec.getAttributeAsBoolean(ENABLED) ? "color: #888888;" : "color: red;")
134-
+ " font-style: italic;";
133+
return Boolean.TRUE.equals(rec.getAttributeAsBoolean(ENABLED)) ? "color: #888888;"
134+
: "color: red;" + " font-style: italic;";
135135
} else {
136136
return super.getCellCSSText(rec, rowNum, colNum);
137137
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
*/
4242
public class LDAPServersPanel extends AdminPanel {
4343

44+
private static final String ENABLED = "eenabled";
45+
4446
private Layout detailsContainer = new VLayout();
4547

4648
private RefreshableListGrid list;
@@ -185,7 +187,7 @@ public void onSuccess(Void result) {
185187

186188
MenuItem enable = new MenuItem();
187189
enable.setTitle(I18N.message("enable"));
188-
enable.setEnabled(!rec.getAttributeAsBoolean("eenabled"));
190+
enable.setEnabled(!rec.getAttributeAsBoolean(ENABLED));
189191
enable.addClickHandler(event -> LDAPService.Instance.get().get(id, new DefaultAsyncCallback<>() {
190192
@Override
191193
public void onSuccess(GUILDAPServer server) {
@@ -204,7 +206,7 @@ public void onSuccess(GUILDAPServer v) {
204206

205207
MenuItem disable = new MenuItem();
206208
disable.setTitle(I18N.message("disable"));
207-
disable.setEnabled(rec.getAttributeAsBoolean("eenabled"));
209+
disable.setEnabled(rec.getAttributeAsBoolean(ENABLED));
208210
disable.addClickHandler(event -> LDAPService.Instance.get().get(id, new DefaultAsyncCallback<>() {
209211
@Override
210212
public void onSuccess(GUILDAPServer server) {
@@ -252,7 +254,7 @@ public void updateRecord(GUILDAPServer server) {
252254

253255
rec.setAttribute("url", server.getUrl());
254256

255-
rec.setAttribute("eenabled", server.isEnabled());
257+
rec.setAttribute(ENABLED, server.isEnabled());
256258

257259
list.refreshRow(list.getRecordIndex(rec));
258260
}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/searchindex/SearchIndexPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private Tab fillParsersTab() {
180180
parsersList.setWidth100();
181181
parsersList.setHeight100();
182182
parsersList.setAutoFetchData(true);
183-
parsersList.setFields(icon, extension, name, aliases);
183+
parsersList.setFields(id, icon, extension, name, aliases);
184184
parsersList.setDataSource(ParsersDS.get());
185185
parsersList.setShowFilterEditor(true);
186186
parsersList.setFilterOnKeypress(true);

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/tenant/TenantsPanel.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
*/
4040
public class TenantsPanel extends AdminPanel {
4141

42+
private static final String ENABLED = "eenabled";
43+
4244
private static final String ADDRESS = "address";
4345

4446
private static final String EMAIL = "email";
@@ -186,7 +188,7 @@ public void updateRecord(GUITenant tenant) {
186188
rec.setAttribute("postalCode", tenant.getPostalCode());
187189
rec.setAttribute("state", tenant.getState());
188190
rec.setAttribute("expire", tenant.getExpire());
189-
rec.setAttribute("eenabled", tenant.isEnabled());
191+
rec.setAttribute(ENABLED, tenant.isEnabled());
190192

191193
list.refreshRow(list.getRecordIndex(rec));
192194
}
@@ -225,7 +227,7 @@ public void onSuccess(Void result) {
225227

226228
MenuItem enable = new MenuItem();
227229
enable.setTitle(I18N.message("enable"));
228-
enable.setEnabled(!rec.getAttributeAsBoolean("eenabled"));
230+
enable.setEnabled(!rec.getAttributeAsBoolean(ENABLED));
229231
enable.addClickHandler(event -> TenantService.Instance.get().load(id, new DefaultAsyncCallback<>() {
230232
@Override
231233
public void onSuccess(GUITenant tenant) {
@@ -244,7 +246,7 @@ public void onSuccess(GUITenant v) {
244246

245247
MenuItem disable = new MenuItem();
246248
disable.setTitle(I18N.message("disable"));
247-
disable.setEnabled(rec.getAttributeAsBoolean("eenabled"));
249+
disable.setEnabled(rec.getAttributeAsBoolean(ENABLED));
248250
disable.addClickHandler(event -> TenantService.Instance.get().load(id, new DefaultAsyncCallback<>() {
249251
@Override
250252
public void onSuccess(GUITenant tenant) {

0 commit comments

Comments
 (0)