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

Browse Source 
43944: Fixes: ALF-16090: fixes view mode for control param showTime.
   43964: Fixes: ALF-14758. Adds distinct styling for menus nested 4 levels or deeper to prevent confusion if there's an overlap.
   44029: MNT-180 - Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
   44040: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44039: Minor changes to TransformerDebug to make output more readable when there are exceptions.
         - NPE when there is no exception message
   44046: MERGE DEV to V4.1-BUG-FIX
     ALF-16562 : CIFS: Excel document version history lost after saving content in Excel:mac 2011 on Mac Mountain Lion
   44115: Changes to standalone file state cache access mode checks to bring them into line with the clustered file state cache.
   44160: Fix for ALF-13129, checks to see if the child association already exists on the versioned node.  If it exists it doesn't add it again.
   44239: ALF-16977: InstallerBuilder 8.5.1 2012-11-29 with layout fix from Bitrock
   44319: Latest installer translations from Gloria
   44343: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3)
      44339: ALF-17070: Merged to V4.1 (4.1.2) from V4.1-BUG-FIX (3.4.12)
         << Regression introduced into 4.0.2 on 12/4/12 r35201 >>
         44337: Merged DEV to V3.4-BUG-FIX (3.4.12)
            44297: ALF-16935: wcm/avm file picker fails to render selection from folders navigation only works with 127.0.0.1 url
            - Fix for regression from ALF-11956, connected with setting titles for file picker controls
      44316: Merged DEV to V4.1
         44094: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Add WebDAV MOVE handling for case when backup is enabled in Mac 2011 Word
         44285: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Handle Mac 2011 Word backup in scope of RenameShuffle
      44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix incremental cache state to cope with duplicate leaf/aux doc entries.
      44283: Encoding fix by David Webster
      44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix initial cache state to cope with duplicate leaf/aux doc entries.
      44252: Russian fix from Gloria
      44200: Probable fix for     ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - still difficult to reproduce
      44149: Merged HEAD to V4.1
         44037: ALF-16947: prevent dependency to web-framework-commons war to be transitive: this artifact is not generated in Ant build
         44039: Version in parent-pom was not changed properly when deploying to Maven repo
      44142: ITALIAN: Translation update based on EN r43623, fixes ALF-16609
      44107: ALF-16016, ALF-15991, ALF-16180: Russian fixes by Gloria
      44078: ALF-16620: Out of memory Error applying CopiedFromAspectPatch
      - CopiedFromAspectPatch.WorkProvider.getNextWork() was fetching discrete managable chunks
      - and then blowing up as it continually fetched into the same in-memory HashSet!
   44404: Merged DEV to V4.1-BUG-FIX
      44378: ALF-16791 : resource bundle deployement for localization does not work with the dynamic approach
      1. Split out MessageService message lookup methods into new interface MessageLookup that lives in DataModel
      2. Added a simple implementation for SOLR to use
      3. Made M2Label look up model labels via a supplied MessageLookup argument
      4. Make DictionaryService extend MessageLookup so that it's easy to find a MessageLookup if you've got a DictionaryService
      5. Accounted for interface changes throughout. 
   44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
         - Not just Ghostscript but any thumbnail failure
   44422: ALF-16123: "CheckOutCheckInService.checkout fails with DuplicateChildNodeNameException if no working copy label message found in current locale"
   44424: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      44423: ALF-17114: Merged V4.1-BUG-FIX (4.1.3) to V4.1 (4.1.2)
         - got the wrong branch
         44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
            44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
               - Not just Ghostscript but any thumbnail failure
   44447: Merged V4.0.2 (4.0.0.22) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      << Recording this as RECORD ONLY as it turns out the DEV code came form V4.1-BUG-FIX r42431 >>
      44435: Merged DEV to V4.0.2 (4.0.2.22)
         44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED
         - Initialize rootRefs in the property definition to prevent NPE.
   44468: Merged V3.4-PATCHES to V4.1-BUG-FIX
     MNT-211 (Still needs implementing on 4.1)
   44470: Fixes: ALF-16878 - don't use IE8's native JSON stringify method.
   44511: ALF-16791: Added missing class.
   44519: ALF-16791: Fixed broken unit tests
   44541: Fix for     ALF-17151   SOLR - add support to disable permission checks
   44542: MNT-211  Re-implement on 4.1
   44548: ALF-16791: Fixed broken SOLR
   44559: ALF-17075: "Exporting and importing null MLText values does not work."
   44577: Final part for     ALF-16558 SOLR tracking does not do incremental updates but one single chunk 
   - fixed code so SolrSearchers are held for as little time as possible
   44590: ALF-14523 (Share - Metadata constraint on workflow creation)
   44594: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44596: ALF-17075: "Exporting and importing null MLText values does not work." - change test name to something more meaningful
   44599: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44600: ALF-16791: Another omission not covered by unit tests
   44603: ALF-14201: upgrade activiti to 5.7-20121211
   44605: Added missing vti.server.url.path.prefix property required by commit 43471
   Missing due to cherry picked commit, this is implemented as part of 39309 on HEAD.
   44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms
   44613: ALF-13690 (Share - It's possible to delete site groups via the UI)
   44618: ALF-16939: "Error "importStatus.batchWeight is undefined" is thrown when Bulk Importer status webscript is run for XML format"
   44621: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
      44620: MNT-247: Merged DEV to PATCHES/V4.1.1 with corrections
         44526: ALF-16964: Share alfrescoCookie connector fails when alfresco.authentication.allowGuestLogin=false, use case proxy between share and alfresco
            Check if external authentication is active in BaseServlet
   44628: Solution for ALF-3780 - Dashboard settings not deleted for deleted user.
   Initial implementation by Dmitry Velichkevich.
   Surf user config folder and user Surf dynamic component references are removed when user node is deleted via a Delete Node policy.
   44632: addition of validation of NetworkFile isClosed property.
   44648: Merge V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.3)
      44566: ALF-17164: Add SVN revision in version.properties when building in continuous mode
      44602: ALF-17164: adding the SCM revision in version.build so that it is displayed
         also, sneak in the SVN path, so that tracability is complete
   44650: BDE-111: Stop creating installers in parallel, it fails on pbld02. Also, revert to zip compression to gain build time
   44651: ALF-14348 (Unable to update external blog configuration details)
   44654: Merged DEV to V4.1-BUG-FIX
      44614: ALF-17119: Possible UI bug - "$$" chars added to permissions for IMAP Attachments folder
      Added a message bundles for FullControll access role.
   44655: Merged DEV to V4.1-BUG-FIX
      44593: ALF-14154: Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
      44612: ALF-14154 : Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
   44666: ALF-12001: Privacy: blog activities - activity is seen for draft blogs
   - Wrong node was being used for access checks
   - Fix by Andrey Chernov
   44671: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
         - Now we can cope with a runAs where the username is in the wrong case
      44296: ALF-17203 / ALF-17201 / MNT-216 : error saving versionable word documents


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-12-13 14:16:40 +00:00
parent ec745776b7
commit ac683161de
17 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/messages/webclient.properties
View File

@@ -353,6 +353,7 @@ Collaborator=Collaborator
Contributor=Contributor Contributor=Contributor
Editor=Editor Editor=Editor
All=All All=All
FullControl=Full Control
ContentManager=Content Manager ContentManager=Content Manager
ContentPublisher=Content Publisher ContentPublisher=Content Publisher
ContentContributor=Content Contributor ContentContributor=Content Contributor

11
pom.xml
View File

@@ -237,12 +237,6 @@
<version>1.3.167</version> <version>1.3.167</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-webapp-explorer2</artifactId>
<version>5.7</version>
<classifier>ui-jar</classifier>
</dependency>
<dependency> <dependency>
<groupId>axis2</groupId> <groupId>axis2</groupId>
<artifactId>addressing</artifactId> <artifactId>addressing</artifactId>
@@ -307,10 +301,7 @@
<profile> <profile>
<id>enterprise</id> <id>enterprise</id>
<activation> <activation>
<property> <activeByDefault>true</activeByDefault>
<name>alfresco.enterprise</name>
<value>true</value>
</property>
</activation> </activation>
<dependencies> <dependencies>
<dependency> <dependency>

36
source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
View File

@@ -499,18 +499,11 @@ public final class AuthenticationHelper
String userId = null; String userId = null;
// If the remote user mapper is configured, we may be able to map in an externally authenticated user // If the remote user mapper is configured, we may be able to map in an externally authenticated user
final WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(sc); RemoteUserMapper remoteUserMapper = getRemoteUserMapper(sc);
RemoteUserMapper remoteUserMapper = (RemoteUserMapper) wc.getBean(REMOTE_USER_MAPPER); if (remoteUserMapper != null)
if (!(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive())
{ {
if (logger.isDebugEnabled())
logger.debug("Remote user mapper configured and active. Asking for external user ID.");
userId = remoteUserMapper.getRemoteUser(httpRequest); userId = remoteUserMapper.getRemoteUser(httpRequest);
} }
else if (logger.isDebugEnabled())
{
logger.debug("No active remote user mapper.");
}
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
if (userId == null) if (userId == null)
@@ -526,6 +519,31 @@ public final class AuthenticationHelper
return userId; return userId;
} }
/**
* Gets the remote user mapper if one is configured and active (i.e. external authentication is in use).
* @param sc
* the servlet context
* @return the remote user mapper if one is configured and active; otherwise <code>null</code>
*/
public static RemoteUserMapper getRemoteUserMapper(final ServletContext sc)
{
final WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
RemoteUserMapper remoteUserMapper = (RemoteUserMapper) wc.getBean(REMOTE_USER_MAPPER);
if (remoteUserMapper != null && !(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive())
{
if (logger.isDebugEnabled())
{
logger.debug("Remote user mapper configured and active.");
}
return remoteUserMapper;
}
if (logger.isDebugEnabled())
{
logger.debug("No active remote user mapper.");
}
return null;
}
/** /**
* Attempts to retrieve the User object stored in the current session. * Attempts to retrieve the User object stored in the current session.
* *

2
source/java/org/alfresco/web/app/servlet/BaseServlet.java
View File

@@ -224,7 +224,7 @@ public abstract class BaseServlet extends HttpServlet
public static void redirectToLoginPage(HttpServletRequest req, HttpServletResponse res, ServletContext sc) public static void redirectToLoginPage(HttpServletRequest req, HttpServletResponse res, ServletContext sc)
throws IOException throws IOException
{ {
redirectToLoginPage(req, res, sc, AuthenticationHelper.getRemoteUser(sc, req) == null); redirectToLoginPage(req, res, sc, AuthenticationHelper.getRemoteUserMapper(sc) == null);
} }
/** /**

4
source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
View File

@@ -401,7 +401,7 @@ public abstract class BaseActionWizard extends BaseWizardBean
// if there wasn't a client based label try and get it from the dictionary // if there wasn't a client based label try and get it from the dictionary
if (label == null) if (label == null)
{ {
label = typeDef.getTitle(); label = typeDef.getTitle(this.getDictionaryService());
} }
// finally, just use the localname // finally, just use the localname
@@ -1053,7 +1053,7 @@ public abstract class BaseActionWizard extends BaseWizardBean
AspectDefinition aspectDef = this.getDictionaryService().getAspect(idQName); AspectDefinition aspectDef = this.getDictionaryService().getAspect(idQName);
if (aspectDef != null) if (aspectDef != null)
{ {
label = aspectDef.getTitle(); label = aspectDef.getTitle(this.getDictionaryService());
} }
else else
{ {

4
source/java/org/alfresco/web/bean/content/BaseContentWizard.java
View File

@@ -337,7 +337,7 @@ public abstract class BaseContentWizard extends BaseWizardBean
// if there wasn't a client based label try and get it from the dictionary // if there wasn't a client based label try and get it from the dictionary
if (parentLabel == null) if (parentLabel == null)
{ {
parentLabel = parentType.getTitle(); parentLabel = parentType.getTitle(this.getDictionaryService());
} }
// finally, just use the localname // finally, just use the localname
@@ -370,7 +370,7 @@ public abstract class BaseContentWizard extends BaseWizardBean
// if there wasn't a client based label try and get it from the dictionary // if there wasn't a client based label try and get it from the dictionary
if (label == null) if (label == null)
{ {
label = typeDef.getTitle(); label = typeDef.getTitle(this.getDictionaryService());
} }
// finally, just use the localname // finally, just use the localname

2
source/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java
View File

@@ -66,7 +66,7 @@ public abstract class BaseComponentGenerator implements IComponentGenerator
protected enum ControlType { FIELD, SELECTOR; } protected enum ControlType { FIELD, SELECTOR; }
private DataDictionary dataDictionary; protected DataDictionary dataDictionary;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public UIComponent generateAndAdd(FacesContext context, UIPropertySheet propertySheet, public UIComponent generateAndAdd(FacesContext context, UIPropertySheet propertySheet,

2
source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java
View File

@@ -160,7 +160,7 @@ public class TextFieldGenerator extends BaseComponentGenerator
} }
// retrieve the display label // retrieve the display label
String label = constraint.getDisplayLabel(value); String label = constraint.getDisplayLabel(value, dataDictionary.getDictionaryService());
if (label == null) if (label == null)
{ {
label = value; label = value;

2
source/java/org/alfresco/web/bean/repository/DataDictionary.java
View File

@@ -58,7 +58,7 @@ public final class DataDictionary implements Serializable
/** /**
*@return dictionaryService *@return dictionaryService
*/ */
private DictionaryService getDictionaryService() public DictionaryService getDictionaryService()
{ {
//check for null for cluster environment //check for null for cluster environment
if (dictionaryService == null) if (dictionaryService == null)

2
source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
View File

@@ -317,7 +317,7 @@ public class CreateRuleWizard extends BaseActionWizard
TypeDefinition typeDef = this.getDictionaryService().getType(idQName); TypeDefinition typeDef = this.getDictionaryService().getType(idQName);
if (typeDef != null) if (typeDef != null)
{ {
label = typeDef.getTitle(); label = typeDef.getTitle(this.getDictionaryService());
} }
else else
{ {

8
source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
View File

@@ -172,7 +172,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
// add the well known cm:content object type by default // add the well known cm:content object type by default
properties.setContentTypes(new ArrayList<SelectItem>(5)); properties.setContentTypes(new ArrayList<SelectItem>(5));
properties.getContentTypes().add(new SelectItem(ContentModel.TYPE_CONTENT.toString(), properties.getContentTypes().add(new SelectItem(ContentModel.TYPE_CONTENT.toString(),
dictionaryService.getType(ContentModel.TYPE_CONTENT).getTitle())); dictionaryService.getType(ContentModel.TYPE_CONTENT).getTitle(dictionaryService)));
// add any configured content sub-types to the list // add any configured content sub-types to the list
List<String> types = getSearchConfig().getContentTypes(); List<String> types = getSearchConfig().getContentTypes();
@@ -188,7 +188,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT)) if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
{ {
// try and get label from the dictionary // try and get label from the dictionary
String label = typeDef.getTitle(); String label = typeDef.getTitle(dictionaryService);
// else just use the localname // else just use the localname
if (label == null) if (label == null)
@@ -220,7 +220,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
// add the well known cm:folder object type by default // add the well known cm:folder object type by default
properties.setFolderTypes(new ArrayList<SelectItem>(5)); properties.setFolderTypes(new ArrayList<SelectItem>(5));
properties.getFolderTypes().add(new SelectItem(ContentModel.TYPE_FOLDER.toString(), properties.getFolderTypes().add(new SelectItem(ContentModel.TYPE_FOLDER.toString(),
dictionaryService.getType(ContentModel.TYPE_FOLDER).getTitle())); dictionaryService.getType(ContentModel.TYPE_FOLDER).getTitle(dictionaryService)));
// add any configured folder sub-types to the list // add any configured folder sub-types to the list
List<String> types = getSearchConfig().getFolderTypes(); List<String> types = getSearchConfig().getFolderTypes();
@@ -236,7 +236,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_FOLDER)) if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_FOLDER))
{ {
// try and get label from the dictionary // try and get label from the dictionary
String label = typeDef.getTitle(); String label = typeDef.getTitle(dictionaryService);
// else just use the localname // else just use the localname
if (label == null) if (label == null)

2
source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
View File

@@ -567,7 +567,7 @@ public class CreateSpaceWizard extends BaseWizardBean
// if there wasn't a client based label try and get it from the dictionary // if there wasn't a client based label try and get it from the dictionary
if (label == null) if (label == null)
{ {
label = typeDef.getTitle(); label = typeDef.getTitle(this.getDictionaryService());
} }
// finally use the localname if we still haven't found a label // finally use the localname if we still haven't found a label

2
source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
View File

@@ -200,7 +200,7 @@ public class UISearchCustomProperties extends SelfRenderingComponent implements
else else
{ {
// or use dictionary label or QName as last resort // or use dictionary label or QName as last resort
label = propDef.getTitle() != null ? propDef.getTitle() : propDef.getName().getLocalName(); label = propDef.getTitle(dd) != null ? propDef.getTitle(dd) : propDef.getName().getLocalName();
} }
// special handling for Date and DateTime // special handling for Date and DateTime

2
source/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java
View File

@@ -89,7 +89,7 @@ public class UIAssociation extends PropertySheetItem
if (displayLabel == null) if (displayLabel == null)
{ {
// try and get the repository assigned label // try and get the repository assigned label
displayLabel = assocDef.getTitle(); displayLabel = assocDef.getTitle(dd.getDictionaryService());
// if the label is still null default to the local name of the property // if the label is still null default to the local name of the property
if (displayLabel == null) if (displayLabel == null)

2
source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java
View File

@@ -89,7 +89,7 @@ public class UIChildAssociation extends PropertySheetItem
if (displayLabel == null) if (displayLabel == null)
{ {
// try and get the repository assigned label // try and get the repository assigned label
displayLabel = assocDef.getTitle(); displayLabel = assocDef.getTitle(dd.getDictionaryService());
// if the label is still null default to the local name of the property // if the label is still null default to the local name of the property
if (displayLabel == null) if (displayLabel == null)

2
source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java
View File

@@ -106,7 +106,7 @@ public class UIProperty extends PropertySheetItem
if (displayLabel == null) if (displayLabel == null)
{ {
// try and get the repository assigned label // try and get the repository assigned label
displayLabel = propDef.getTitle(); displayLabel = propDef.getTitle(dd.getDictionaryService());
// if the label is still null default to the local name of the property // if the label is still null default to the local name of the property
if (displayLabel == null) if (displayLabel == null)

13
source/web/scripts/ajax/file_picker_widget.js
View File

@@ -207,7 +207,7 @@ _showSelectedValue: function()
this._selectButton.value = (this.value == null this._selectButton.value = (this.value == null
? alfresco.resources["select"] ? alfresco.resources["select"]
: alfresco.resources["change"]); : alfresco.resources["change"]);
this._selectButton.title = (null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + this._selectButton.value + " " + alfresco.resources["path"]; this._selectButton.title = ((null == this.node.widget) || (null == this.node.widget.labelNode)) ? ("") : (this.node.widget.labelNode.getText() + " ") + this._selectButton.value + " " + alfresco.resources["path"];
this._selectButton.disabled = this.readonly; this._selectButton.disabled = this.readonly;
this._selectButton.style.margin = "0px 10px"; this._selectButton.style.margin = "0px 10px";
this.node.appendChild(this._selectButton); this.node.appendChild(this._selectButton);
@@ -427,7 +427,7 @@ _showPicker: function(data)
cancelButton.filePickerWidget = this; cancelButton.filePickerWidget = this;
cancelButton.value = alfresco.resources["cancel"]; cancelButton.value = alfresco.resources["cancel"];
cancelButton.title = (null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + alfresco.resources["cancel"]; cancelButton.title = ((null == this.node.widget) || (null == this.node.widget.labelNode)) ? ("") : (this.node.widget.labelNode.getText() + " ") + alfresco.resources["cancel"];
footerDiv.appendChild(cancelButton); footerDiv.appendChild(cancelButton);
cancelButton.style.margin = ((.5 * footerDiv.offsetHeight) - cancelButton.style.margin = ((.5 * footerDiv.offsetHeight) -
@@ -515,7 +515,8 @@ _createRow: function(fileName, webappRelativePath, isDirectory, isSelectable, f
e.type = "button"; e.type = "button";
e.name = webappRelativePath; e.name = webappRelativePath;
e.value = "Select"; e.value = "Select";
e.title = ((null != this.node.widget.labelNode) ? (this.node.widget.labelNode.getText()) : ("")) + " " + e.value + " " + webappRelativePath; e.title = ((null != this.node.widget) && (null != this.node.widget.labelNode) ? (this.node.widget.labelNode.getText()) : ("")) + " " + e.value + " " + webappRelativePath;
result.appendChild(e); result.appendChild(e);
e.style.position = "absolute"; e.style.position = "absolute";
@@ -848,7 +849,7 @@ _showSelectedValue: function()
} }
}); });
this._selectButton.filePickerWidget = this; this._selectButton.filePickerWidget = this;
this._selectButton.title = (null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + this._selectButton.value + " " + alfresco.resources["path"], this._selectButton.title = ((null == this.node.widget) || (null == this.node.widget.labelNode)) ? ("") : (this.node.widget.labelNode.getText() + " ") + this._selectButton.value + " " + alfresco.resources["path"],
this._selectButton.inject(this.wrapper); this._selectButton.inject(this.wrapper);
var nodeSize = node.getSize(); var nodeSize = node.getSize();
var selectButtonSize = this._selectButton.getSize(); var selectButtonSize = this._selectButton.getSize();
@@ -1035,7 +1036,7 @@ _showPicker: function(data)
{ {
"type" : "button", "type" : "button",
"value" : alfresco.resources["cancel"], "value" : alfresco.resources["cancel"],
"title": ((null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + alfresco.resources["cancel"]), "title": ((null == this.node.widget) || (null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + alfresco.resources["cancel"]),
"events" : { "events" : {
"click" : function(event) "click" : function(event)
{ {
@@ -1168,7 +1169,7 @@ _createRow: function(fileName, webappRelativePath, isDirectory, isSelectable, f
} }
} }
); );
e.title = ((null != this.node.widget.labelNode) ? (this.node.widget.labelNode.getText()) : ("")) + " " + e.value + " " + webappRelativePath; e.title = ((null != this.node.widget) && (null != this.node.widget.labelNode) ? (this.node.widget.labelNode.getText()) : ("")) + " " + e.value + " " + webappRelativePath;
e.inject(result); e.inject(result);
} }
return result; return result;