Changeset 7908

Timestamp:

Feb 12, 2021, 10:52:20 AM (10 months ago)

Author:

Nicklas Nordborg

Message:

Fixes #2242: More control over table cells from extensions

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/list/AbstractListColumnBean.java (modified) (2 diffs)
• src/clients/web/net/sf/basedb/clients/web/extensions/list/ListColumnAction.java (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/extensions/list/PropertyPathActionFactory.java (modified) (3 diffs)
• src/clients/web/net/sf/basedb/clients/web/taglib/table/Cell.java (modified) (7 diffs)
• src/clients/web/net/sf/basedb/clients/web/taglib/table/ExtensionCells.java (modified) (1 diff)
• www/WEB-INF/table.tld (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/list/AbstractListColumnBean.java

@@ -50 +50 @@
   private String title;
   private String subtitle;
+  private String cellClass;
+  private String cellStyle;
+  private boolean disableOverflowCheck;
   private String tooltip;
   private String property;
@@ -121 +124 @@
 
   @Override
+  public String getCellClass() 
+  {
+    return cellClass;
+  }
+  public void setCellClass(String cellClass)
+  {
+    this.cellClass = cellClass;
+  }
+
+  @Override
+  public String getCellStyle() 
+  {
+    return cellStyle;
+  }
+  public void setCellStyle(String cellStyle)
+  {
+    this.cellStyle = cellStyle;
+  }
+
+  @Override
+  public boolean getDisableOverflowCheck() 
+  {
+    return disableOverflowCheck;
+  }
+  public void setDisableOverflowCheck(boolean disableOverflowCheck)
+  {
+    this.disableOverflowCheck = disableOverflowCheck;
+  }
+
+  
+  @Override
   public String getTooltip() 
   {

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/list/ListColumnAction.java

@@ -79 +79 @@
   
   /**
+    Optional extra classes to add to table cell (td)
+    tags for this column.
+    @since 3.18
+  */
+  public default String getCellClass()
+  {
+    return null;
+  }
+  
+  /**
+    Optional extra style definition to add to table cell (td)
+    tags for this column.
+    @since 3.18
+  */
+  public default String getCellStyle()
+  {
+    return null;
+  }
+  
+  /**
+    If set, text overflow check is disabled for this column.
+    If not set, the global settings for the logged in user is used.
+    @since 3.18
+  */
+  public default boolean getDisableOverflowCheck()
+  {
+    return false;
+  }
+  
+  /**
     An optional tooltip that is displayed when the mouse is over the 
     column header.

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/list/PropertyPathActionFactory.java

@@ -70 +70 @@
   private String title;
   private String subtitle;
+  private String cellClass;
+  private String cellStyle;
+  private boolean disableOverflowCheck;
   private String tooltip;
   private String property;
@@ -133 +136 @@
     action.setTitle(title);
     action.setSubtitle(subtitle);
+    action.setCellClass(cellClass);
+    action.setCellStyle(cellStyle);
+    action.setDisableOverflowCheck(disableOverflowCheck);
     action.setTooltip(tooltip);
     action.setProperty(property);
@@ -181 +187 @@
     this.subtitle = subtitle;
   }
+
+  /**
+    @since 3.18
+  */
+  public void setCellClass(String cellClass)
+  {
+    this.cellClass = cellClass;
+  }
+
+  /**
+    @since 3.18
+  */
+  public void setCellStyle(String cellStyle)
+  {
+    this.cellStyle = cellStyle;
+  }
+  
+  /**
+    @since 3.18
+  */
+  public void setDisableOverflowCheck(boolean disableOverflowCheck)
+  {
+    this.disableOverflowCheck = disableOverflowCheck;
+  }
   
   public void setTooltip(String tooltip)

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/Cell.java

@@ -40 +40 @@
    <tbl:cell
       clazz=...
+      subclass=...
       errorclazz=...
       style=...
@@ -142 +143 @@
 
   /**
+    More classes.
+    @since 3.18
+  */
+  private String subclass = null;
+  
+  /**
     Optional <code>class</code> attribute for errors.
   */
@@ -171 +178 @@
   private boolean isHidden;
   
+  private boolean disableOverflowCheck = false;
   private int maxCharacters = 50;
   private boolean autoShow = true;
@@ -189 +197 @@
   
   /**
+    @since 3.18
+  */
+  public void setSubclass(String subclas)
+  {
+    this.subclass = subclas;
+  }
+  /**
+    @since 3.18
+  */
+  public String getSubclass()
+  {
+    return subclass;
+  }
+  
+  
+  /**
     @since 2.9.1
   */
@@ -243 +267 @@
   {
     return formatter;
+  }
+  
+  /**
+    @since 3.18
+  */
+  public void setDisableOverflowCheck(boolean disable)
+  {
+    this.disableOverflowCheck = disable;
   }
   
@@ -285 +317 @@
     if (isHidden) return SKIP_BODY;
     
-    if (xtCells != null) value = xtCells.getCurrentValue();
+    if (xtCells != null) value = xtCells.getCurrentValue(this);
     
     formatter = table.getFormatter(columnId);
@@ -303 +335 @@
       content += formatter == null ? value.toString() : formatter.format(value);
     }
-    boolean overflowed = maxCharacters > 0 && content.length() > maxCharacters && 
+    boolean overflowed = !disableOverflowCheck && maxCharacters > 0 && content.length() > maxCharacters && 
       HTML.textLength(content) > maxCharacters;
 
     StringBuilder sb = new StringBuilder();
     sb.append("\t<td");
-    if (getClazz() != null) sb.append(" class=\"").append(getClazz()).append("\"");
+    if (getClazz() != null || getSubclass() != null)
+    {
+      sb.append(" class=\"");
+      if (getClass() != null) sb.append(getClazz());
+      if (getSubclass() != null) sb.append(" ").append(getSubclass());
+      sb.append("\"");
+    }
     if (getStyle() != null) sb.append(" style=\"").append(getStyle()).append("\"");
     if (getId() != null) sb.append(" id=\"").append(getId()).append("\"");

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/ExtensionCells.java

@@ -157 +157 @@
   
   /**
-    Get the value for the current column and item.
+    Get the value for the current column and item and
+    update other settings for the cell. Note that it is
+    important that the current value is retrieved first.
+    This can give the action an opportunity to return different
+    values for the other settings depending on the current item.
   */
   @SuppressWarnings("unchecked")
-  Object getCurrentValue()
+  Object getCurrentValue(Cell cell)
   {
-    return current.getValue(dc, item);
+    Object value = current.getValue(dc, item);
+    cell.setSubclass(current.getCellClass());
+    cell.setStyle(current.getCellStyle());
+    cell.setDisableOverflowCheck(current.getDisableOverflowCheck());
+    return value;
   }
   

trunk/www/WEB-INF/table.tld

@@ -636 +636 @@
     </attribute>
     <attribute>
+      <name>subclass</name>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
       <name>errorclazz</name>
       <rtexprvalue>true</rtexprvalue>
@@ -654 +658 @@
     <attribute>
       <name>value</name>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>disableOverflowCheck</name>
       <rtexprvalue>true</rtexprvalue>
     </attribute>