Merged V3.2 to HEAD

16798: Fix for ETHREEOH-1305. Null Path error if user clicks on Next Item icon on View Details page.
   16800: Fix for ETHREEOH-2884 - Language icon near the content is displayed as "NULL". User can't change any language.
   16805: Merged DEV-TEMPORARY to V3.2
      16789: ETHREEOH-1895: Performing "Done Editing" action simultaneously leads to NPE
   16806: ETHREEOH-1898 - Delete icon missing from Shortcut list in Shelf
   16807: Fix for ETHREEOH-2356 - Error message appears when user tries to apply template to locked content.
      - missed one of the actions with the evaluator wrapping first time around.
   16808: Minor javadoc update
   16815: XHTML compliance fixes. Dashboard pages etc. now render as fully compliant XHTML again.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java

@@ -244,7 +244,6 @@ public class FileDetailsBean extends AVMDetailsBean
       }
    }
 
-
    @Override
    protected String finishImpl(FacesContext context, String outcome) throws Exception
    {
@@ -268,9 +267,15 @@ public class FileDetailsBean extends AVMDetailsBean
       return getAvmNode().getId();
    }
 
-
    public String getOutcome()
    {
-      return "dialog:close:dialog:showFileDetails";
+      if ( getAvmNode() != null && AVMUtil.isWorkflowStore(AVMUtil.getStoreName(getAvmNode().getPath())) )
+      {
+          return "dialog:close:dialog:workflowShowFileDetails";
+      }
+      else
+      {
+          return "dialog:close:dialog:showFileDetails";
+      }
    }
 }