inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
15908: Merged V3.1 to V3.2 (record only)
      15907: Merged V3.2 to V3.1
         15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent
   15972: Merged V3.1 to V3.2
      15429: **Record only** I18N message IDs for JSF dashlets
      15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect
      15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page.
      15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null.
      15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page.
      15957: Merged DEV-TEMPORARY to V3.1
         15865: Fix for ETHREEOH-2673
      15958: Merged DEV-TEMPORARY to V3.1
         15885: ETHREEOH-2615: Localization Issue - Japanese UI
      15959: Merged DEV-TEMPORARY to V3.1
         15882: ETHREEOH-2644: Sending Email using Template throws exception
      15962: Fix for ETHREEOH-2390
      15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname
      15965: Merged DEV/BELARUS/V3.1
         15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly
      15966: Merged V2.2 to V3.1
         15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719.
      15969: Prep for ETHREEOH-2295 fixes and associated merges.
      15970: Merged DEV-TEMPORARY to V3.1
         14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574
         15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed
         15824: ETHREEOH-2295 - higlight stale object
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949
   Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824
   Merged /alfresco/BRANCHES/V2.2:r15948
   Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970
   Merged /alfresco/BRANCHES/V3.2:r15908,15972


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-10-13 20:33:02 +00:00
parent 6c3b7b8cd6
commit f03cabea25
82 changed files with 1103 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
View File

@@ -25,7 +25,6 @@
package org.alfresco.web.ui.common.renderer.data;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -175,11 +174,23 @@ public class RichListRenderer extends BaseRenderer
private static final long serialVersionUID = -2753231623981676639L;
public static final String VIEWMODEID = "details";
public static final String STALE_CSS= "conflictItemsList";
public String getViewModeID()
{
return VIEWMODEID;
}
public String getRowStyle(FacesContext context, UIRichList richList, Object row)
{
String rowStyle = (String)richList.getAttributes().get("rowStyleClass");
String altStyle = (String)richList.getAttributes().get("altRowStyleClass");
if (altStyle != null && (this.rowIndex++ & 1) == 1)
{
rowStyle = altStyle;
}
return rowStyle;
}
public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns)
throws IOException
@@ -231,13 +242,7 @@ public class RichListRenderer extends BaseRenderer
// output row or alt style row if set
out.write("<tr");
String rowStyle = (String)richList.getAttributes().get("rowStyleClass");
String altStyle = (String)richList.getAttributes().get("altRowStyleClass");
if (altStyle != null && (this.rowIndex++ & 1) == 1)
{
rowStyle = altStyle;
}
outputAttribute(out, rowStyle, "class");
outputAttribute(out, getRowStyle(context, richList, row), "class");
out.write('>');
// find the actions column if it exists
@@ -321,7 +326,7 @@ public class RichListRenderer extends BaseRenderer
out.write("</td></tr>");
}
private int rowIndex = 0;
protected int rowIndex = 0;
}