use vectorial icon to mark default store

Author: car031

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

@@ -1,7 +1,7 @@
 package com.logicaldoc.gui.common.client.data;
 
 import com.smartgwt.client.data.DataSource;
-import com.smartgwt.client.data.fields.DataSourceImageField;
+import com.smartgwt.client.data.fields.DataSourceBooleanField;
 import com.smartgwt.client.data.fields.DataSourceTextField;
 
 /**
@@ -19,7 +19,7 @@ public StoresDS(boolean withEmpty, boolean parameters) {
 		id.setPrimaryKey(true);
 		DataSourceTextField name = new DataSourceTextField("name");
 		DataSourceTextField path = new DataSourceTextField("path");
-		DataSourceImageField write = new DataSourceImageField("write");
+		DataSourceBooleanField write = new DataSourceBooleanField("write");
 		setFields(write, id, name, path);
 		setDataURL("data/stores.xml?empty=" + withEmpty + "&parameters=" + parameters);
 		setClientOnly(true);

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

@@ -4,26 +4,26 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.logicaldoc.gui.common.client.Feature;
 import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
+import com.logicaldoc.gui.common.client.Feature;
 import com.logicaldoc.gui.common.client.Session;
 import com.logicaldoc.gui.common.client.beans.GUIParameter;
 import com.logicaldoc.gui.common.client.data.StoresDS;
 import com.logicaldoc.gui.common.client.grid.IdListGridField;
 import com.logicaldoc.gui.common.client.grid.RefreshableListGrid;
 import com.logicaldoc.gui.common.client.i18n.I18N;
 import com.logicaldoc.gui.common.client.log.GuiLog;
+import com.logicaldoc.gui.common.client.util.AwesomeFactory;
 import com.logicaldoc.gui.common.client.util.ItemFactory;
 import com.logicaldoc.gui.common.client.util.LD;
 import com.logicaldoc.gui.common.client.util.Util;
 import com.logicaldoc.gui.frontend.client.services.SettingService;
 import com.smartgwt.client.data.Record;
-import com.smartgwt.client.types.Alignment;
-import com.smartgwt.client.types.ListGridFieldType;
 import com.smartgwt.client.types.SelectionStyle;
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.form.fields.SelectItem;
+import com.smartgwt.client.widgets.grid.CellFormatter;
 import com.smartgwt.client.widgets.grid.ListGrid;
 import com.smartgwt.client.widgets.grid.ListGridField;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -43,8 +43,6 @@ public class StoresPanel extends VLayout {
 
 	private static final String STORE = "store.";
 
-	private static final String DATABASE_EDIT = "database_edit";
-
 	private static final String VALUE = "value";
 
 	private static final String WRITE = "write";
@@ -139,14 +137,21 @@ protected Canvas getExpansionComponent(final ListGridRecord rec) {
 
 		ListGridField type = prepareTypeField();
 
-		ListGridField write = new ListGridField(WRITE, " ", 20);
-		write.setType(ListGridFieldType.IMAGE);
+		ListGridField write = new ListGridField(WRITE, " ", 30);
 		write.setCanSort(false);
-		write.setAlign(Alignment.CENTER);
-		write.setShowDefaultContextMenu(false);
-		write.setImageURLPrefix(Util.imagePrefix());
-		write.setImageURLSuffix(".png");
 		write.setCanFilter(false);
+		write.setCellFormatter(new CellFormatter() {
+
+			@Override
+			public String format(Object value, ListGridRecord rec, int rowNum, int colNum) {
+				String content = "";
+				if (Boolean.TRUE.equals(rec.getAttributeAsBoolean(WRITE))) {
+					content = "<div style='display: flex; text-align: center; justify-content: center;'>"
+							+ AwesomeFactory.getIconButtonHTML("database", null, "default", null, null) + "</div>";
+				}
+				return content;
+			}
+		});
 
 		storesGrid.setFields(id, write, name, type, path);
 		storesGrid.setAutoFetchData(true);
@@ -238,7 +243,7 @@ private void refresh() {
 	 * Prepares the context menu
 	 */
 	private void showContextMenu() {
-		MenuItem makeWrite = prepareMakeWriteMenuItem();
+		MenuItem makeWrite = prepareMakeDefaultWriteMenuItem();
 
 		MenuItem test = prepareTestMenuItem();
 
@@ -260,7 +265,7 @@ private MenuItem prepareDeleteMenuItem() {
 				doRemoveStore(selectedStoreId);
 			}
 		}));
-		delete.setEnabled(!Session.get().isDemo() && !DATABASE_EDIT.equals(selectedRecord.getAttributeAsString(WRITE)));
+		delete.setEnabled(!Session.get().isDemo() && !selectedRecord.getAttributeAsBoolean(WRITE));
 		return delete;
 	}
 
@@ -298,17 +303,17 @@ public void onSuccess(Boolean result) {
 		return test;
 	}
 
-	private MenuItem prepareMakeWriteMenuItem() {
+	private MenuItem prepareMakeDefaultWriteMenuItem() {
 		MenuItem makeWrite = new MenuItem();
 		makeWrite.setTitle(I18N.message("makedefwritestore"));
 		makeWrite.addClickHandler(event -> {
 			ListGridRecord[] recs = storesGrid.getRecords();
 			for (ListGridRecord rec : recs) {
-				rec.setAttribute(WRITE, "blank");
+				rec.setAttribute(WRITE, false);
 				storesGrid.refreshRow(storesGrid.getRowNum(rec));
 			}
 			ListGridRecord selectedRecord = storesGrid.getSelectedRecord();
-			selectedRecord.setAttribute(WRITE, DATABASE_EDIT);
+			selectedRecord.setAttribute(WRITE, true);
 			storesGrid.refreshRow(storesGrid.getRowNum(storesGrid.getSelectedRecord()));
 		});
 		makeWrite.setEnabled(!Session.get().isDemo());
@@ -345,7 +350,7 @@ private List<GUIParameter> collectSettings() {
 						new GUIParameter(STORE + storeId + ".dir", storeRecord.getAttributeAsString("path").trim()));
 				settings.add(
 						new GUIParameter(STORE + storeId + ".type", storeRecord.getAttributeAsString("type").trim()));
-				if (DATABASE_EDIT.equals(storeRecord.getAttributeAsString(WRITE))) {
+				if (storeRecord.getAttributeAsBoolean(WRITE)) {
 					settings.add(new GUIParameter("store.write", storeId));
 				}
 
@@ -398,7 +403,7 @@ private void onAddStore() {
 			}
 		}
 	}
-	
+
 	@Override
 	public boolean equals(Object other) {
 		return super.equals(other);

logicaldoc-webapp/src/main/java/com/logicaldoc/web/data/StoresDataServlet.java

@@ -65,7 +65,6 @@ protected void service(HttpServletRequest request, HttpServletResponse response,
 				writer.print("<id />");
 				writer.print("<name />");
 				writer.print("<path />");
-				writer.print("<write>blank</write>");
 				writer.print("<type>fs</type>");
 				writer.print(CLOSE_STORE);
 			}
@@ -87,7 +86,7 @@ private void printStores(PrintWriter writer, HttpServletRequest request, Session
 			writer.print("<id>" + i + "</id>");
 			writer.print("<name>Store " + i + "</name>");
 			writer.print("<path><![CDATA[" + path + "]]></path>");
-			writer.print("<write>" + (conf.getInt("store.write") == i ? "database_edit" : "blank") + "</write>");
+			writer.print("<write>" + Boolean.toString(conf.getInt("store.write") == i) + "</write>");
 			String type = conf.getProperty(STORE + i + ".type");
 			if (StringUtils.isEmpty(type))
 				type = "fs";