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.1 to HEAD

Browse Source 
13625: Fix ETHREEOH-1644
   13634: Merged V2.2 to V3.1
      13632: Preparation for fix of ETHREEOH-1663: ML Document Editions Broken by Upgrade to 3.1
   13636: Fixed ETHREEOH-1663: ML Document Editions Broken by Upgrade to 3.1
   13638: Fixed ETHREEOH-1665: Copy/pasting a Specialised Folder changes the assoc qname
   13639: Fixed ETHREEOH-1663: ML Document Editions Broken by Upgrade to 3.1
   13640: Fixed ETHREEOH-1672: Manage Multilingual Content JSP breaks when viewing all Related Content
   13641: Fixed ETHREEOH-1657: Manage Multilingual Content fails with NPE when document was previously versionable
   13774: Fix for ETHREEOH-1629
   13775: Fix for ETHREEOH-1645
   13784: SchemaBootstrap now auto-generates a mostly-canonical schema description on new DB and on upgrades
   13804: Added option to finish schema bootstrap, dump schema structure and exit
   13807: Further pretty formatting of schema dump
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.2:r13632
      Merged /alfresco/BRANCHES/V3.1:r13625,13634,13636,13638-13641,13774-13775,13784,13804,13807


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-04-09 13:54:02 +00:00
parent 575010b134
commit 2af823d97b
4 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java
View File

@@ -487,6 +487,19 @@ public class MultilingualManageDialog extends BaseDialogBean
// add each translation in the SingleEditionBean // add each translation in the SingleEditionBean
for (VersionHistory versionHistory : translationHistories) for (VersionHistory versionHistory : translationHistories)
{ {
for (Version checkVersion : versionHistory.getAllVersions())
{
NodeRef frozenStateNodeRef = checkVersion.getFrozenStateNodeRef();
if (frozenStateNodeRef.getStoreRef().getIdentifier().equals("lightWeightVersionStore"))
{
// It's the old one pulled back by serialization
// Repopulate the version history
NodeRef versionedNodeRef = checkVersion.getVersionedNodeRef();
versionHistory = versionService.getVersionHistory(versionedNodeRef);
break;
}
}
// get the list of versions and sort them ascending according their version label // get the list of versions and sort them ascending according their version label
List<Version> orderedVersions = new ArrayList<Version>(versionHistory.getAllVersions()); List<Version> orderedVersions = new ArrayList<Version>(versionHistory.getAllVersions());
Collections.sort(orderedVersions, new VersionLabelComparator()); Collections.sort(orderedVersions, new VersionLabelComparator());

26
source/web/jsp/actions/mail.jsp
View File

@@ -42,31 +42,35 @@
<script type="text/javascript"> <script type="text/javascript">
window.onload = pageLoaded; /* The mootools API is used since its lib included in head.
It also usefull to use their String.trim() to disable blank subject field */
function pageLoaded() window.addEvent('load', mailPageLoaded);
function mailPageLoaded()
{ {
document.getElementById("email-action:subject").focus(); // ensure the attribute exists
checkButtonState(); $("email-action:ok-button").set({disabled:'disabled'});
$("email-action:subject").focus();
mailCheckButtonState();
} }
function checkButtonState() function mailCheckButtonState()
{ {
var disableBtn = document.getElementById("finishButtonDisabled").innerHTML; if ($("email-action:subject").value.trim().length > 0 && $("finishButtonDisabled").value == "false")
if (document.getElementById("email-action:subject").value.length > 0 && disableBtn == "false")
{ {
document.getElementById("email-action:ok-button").disabled = false; $("email-action:ok-button").disabled = false;
} }
else else
{ {
document.getElementById("email-action:ok-button").disabled = true; $("email-action:ok-button").disabled = true;
} }
} }
</script> </script>
<f:view> <f:view>
<h:outputText id="finishButtonDisabled" value="#{WizardManager.bean.finishButtonDisabled}" style="display:none;"/> <h:inputHidden id="finishButtonDisabled" value="#{WizardManager.bean.emailRecipientsDataModel.rowCount le 0}"/>
<%-- load a bundle of properties with I18N strings --%> <%-- load a bundle of properties with I18N strings --%>
@@ -207,7 +211,7 @@
<td style="padding-left:16px"><h:outputText value="#{msg.subject}"/>:</td> <td style="padding-left:16px"><h:outputText value="#{msg.subject}"/>:</td>
<td width="90%"> <td width="90%">
<h:inputText id="subject" value="#{WizardManager.bean.actionProperties.subject}" size="75" maxlength="1024" <h:inputText id="subject" value="#{WizardManager.bean.actionProperties.subject}" size="75" maxlength="1024"
onkeyup="javascript:checkButtonState();" />&nbsp;* onkeyup="javascript:mailCheckButtonState();" />&nbsp;*
</td> </td>
</tr> </tr>

2
source/web/jsp/ml/ml-container-details.jsp
View File

@@ -278,7 +278,7 @@
</a:actionLink> </a:actionLink>
</a:column> </a:column>
<a:dataPager id="pager1" styleClass="pager" /> <a:dataPager id="pager1_${idx}" styleClass="pager" />
</a:richList> </a:richList>
</a:panel> </a:panel>
<f:verbatim> <f:verbatim>

28
source/web/jsp/wcm/output-path-pattern-help.jsp
View File

@@ -1,3 +1,6 @@
<jsp:root version="1.2" xmlns:jsp="http://java.sun.com/JSP/Page">
<jsp:directive.page language="java" pageEncoding="UTF-8" />
<script type="text/javascript"> <script type="text/javascript">
function toggleOutputPathPatternHelp() function toggleOutputPathPatternHelp()
{ {
@@ -10,19 +13,19 @@
<div>An output path pattern is a <a style="color:blue;" href="http://freemarker.sourceforge.net">FreeMarker</a> expression which is used to specify the path to use when saving a generated asset using variable substitution when creating web content.</div> <div>An output path pattern is a <a style="color:blue;" href="http://freemarker.sourceforge.net">FreeMarker</a> expression which is used to specify the path to use when saving a generated asset using variable substitution when creating web content.</div>
<br/> <br/>
<div style="font-weight: bold">Guidelines</div> <div style="font-weight: bold">Guidelines</div>
<div>Output path patterns beginning with a leading slash (such as <tt>/&#36;{webapp}/content/&#36;{name}.xml</tt>) will produce paths rooted at the sandbox. Those not begining with a leading slash will produce paths relative to the current working directory when the create web content wizard is invoked.</div> <div>Output path patterns beginning with a leading slash (such as <tt><jsp:text><![CDATA[/&#36;&#123;webapp&#125;/content/&#36;&#123;name&#125;.xml]]></jsp:text></tt>) will produce paths rooted at the sandbox. Those not begining with a leading slash will produce paths relative to the current working directory when the create web content wizard is invoked.</div>
<br/> <br/>
<div style="font-weight: bold">Variables</div> <div style="font-weight: bold">Variables</div>
<table border="0" cellspacing="1" cellpadding="1"> <table border="0" cellspacing="1" cellpadding="1">
<colgroup><col width="15%"/><col width="85%"/></colgroup> <colgroup><col width="15%"/><col width="85%"/></colgroup>
<tbody> <tbody>
<tr><td><tt style="font-weight:bold;">name</td></tt><td>The name of the form instance data as entered by the user in the create web content wizard.</td></tr> <tr><td><tt style="font-weight:bold;">name</tt></td><td>The name of the form instance data as entered by the user in the create web content wizard.</td></tr>
<tr><td><tt style="font-weight:bold;">webapp</td></tt><td>The name of the webapp in which the form instance data is being created. Typically, if specifying an absolute output path pattern, the path will begin with the webapp folder (i.e. <tt>/&#36;{webapp}/...</tt>)</td></tr> <tr><td><tt style="font-weight:bold;">webapp</tt></td><td>The name of the webapp in which the form instance data is being created. Typically, if specifying an absolute output path pattern, the path will begin with the webapp folder (i.e. <tt><jsp:text><![CDATA[/&#36;&#123;webapp&#125;/...]]></jsp:text></tt>)</td></tr>
<tr><td><tt style="font-weight:bold;">cwd</td></tt><td>The webapp relative path in which the form is being created.</td></tr> <tr><td><tt style="font-weight:bold;">cwd</tt></td><td>The webapp relative path in which the form is being created.</td></tr>
<tr><td><tt style="font-weight:bold;">extension</td></tt><td>The default extension associated with the mime-type configured for the rendering engine template. This variable is only available for rendition ouput path patterns.</td></tr> <tr><td><tt style="font-weight:bold;">extension</tt></td><td>The default extension associated with the mime-type configured for the rendering engine template. This variable is only available for rendition ouput path patterns.</td></tr>
<tr><td><tt style="font-weight:bold;">xml</td></tt><td>The xml instance data collected by the form.</td></tr> <tr><td><tt style="font-weight:bold;">xml</tt></td><td>The xml instance data collected by the form.</td></tr>
<tr><td><tt style="font-weight:bold;">node</td></tt><td>The form instance data node. This variable is only available for rendition ouput path patterns.</td></tr> <tr><td><tt style="font-weight:bold;">node</tt></td><td>The form instance data node. This variable is only available for rendition ouput path patterns.</td></tr>
<tr><td><tt style="font-weight:bold;">date</td></tt><td>The current date at which the form instance data is being saved. Refer to the <a style="color:blue;" href="http://freemarker.sourceforge.net/docs/ref_builtins_date.html">FreeMarker date reference</a> for more information.</td></tr> <tr><td><tt style="font-weight:bold;">date</tt></td><td>The current date at which the form instance data is being saved. Refer to the <a style="color:blue;" href="http://freemarker.sourceforge.net/docs/ref_builtins_date.html">FreeMarker date reference</a> for more information.</td></tr>
</tbody> </tbody>
</table> </table>
@@ -31,12 +34,13 @@
<table border="0" cellspacing="1" cellpadding="1"> <table border="0" cellspacing="1" cellpadding="1">
<colgroup><col width="25%"/><col width="75%"/></colgroup> <colgroup><col width="25%"/><col width="75%"/></colgroup>
<tbody> <tbody>
<tr><td><tt style="font-weight:bold;">&#36;{name}.xml</td></tt><td>form_name.xml</td></tr> <tr><td><tt style="font-weight:bold;"><jsp:text><![CDATA[&#36;&#123;name&#125;.xml]]></jsp:text></tt></td><td>form_name.xml</td></tr>
<tr><td><tt style="font-weight:bold;">&#36;{name}.&#36;{extension}</td></tt><td>form_name.html</td></tr> <tr><td><tt style="font-weight:bold;"><jsp:text><![CDATA[&#36;&#123;name&#125;.&#36;&#123;extension&#125;]]></jsp:text></tt></td><td>form_name.html</td></tr>
<tr><td><tt style="font-weight:bold;">/&#36;{webapp}/content/&#36;{name}.xml</td></tt><td>/ROOT/content/form_name.xml</td></tr> <tr><td><tt style="font-weight:bold;"><jsp:text><![CDATA[&#36;&#123;webapp&#125;/content/&#36;&#123;name&#125;.xml]]></jsp:text></tt></td><td>/ROOT/content/form_name.xml</td></tr>
<tr><td><tt style="font-weight:bold;">&#36;{date?string("yyyy-MM-dd")}.xml</td></tt><td>2007-01-09.xml</td></tr> <tr><td><tt style="font-weight:bold;"><jsp:text><![CDATA[&#36;&#123;date&#63;string("yyyy-MM-dd")&#125;.xml]]></jsp:text></tt></td><td>2007-01-09.xml</td></tr>
</tbody> </tbody>
</table> </table>
<br/> <br/>
<div>For a more complete reference, please refer to the <a style="color: blue" href="http://wiki.alfresco.com">wiki.</a></div> <div>For a more complete reference, please refer to the <a style="color: blue" href="http://wiki.alfresco.com">wiki.</a></div>
</div> </div>
</jsp:root>