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

Merged V3.3-BUG-FIX to HEAD

Browse Source 
22991: Fix ALF-3462: Folder rules files shown up when user clicks "all document". Generally cleaned up filter code.
   22992: Fix missing HTML escaping in web previewer
   22994: Fix ALF-5047: Error 404 is thrown when disabling flash file upload.
   22998: Fix ALF-4370: Incorrect behaiour of Content in My Profile if any datalist item was created
   22999: Fix ALF-4864: Copy Folder functionality does not seem to work.
   23000: Fix ALF-4703: Share Unable to Edit Metadata more than Once with Auditing Enabled
   23001: *RECORD ONLY* Set force="no" on Slingshot JavaScript concatenization build target (already on HEAD)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2010-10-08 17:03:14 +00:00
parent 9f47cfba9d
commit d4efda5ea9
3 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
View File

@@ -24,10 +24,11 @@ function main()
majorVersion = false, majorVersion = false,
description = ""; description = "";
// Prevents Flash-sourced "null" values being set for those parmeters where they are invalid // Prevents Flash- and IE8-sourced "null" values being set for those parameters where they are invalid.
// Note: DON'T use a "!==" comparison for "null" here.
var fnFieldValue = function(p_field) var fnFieldValue = function(p_field)
{ {
return field.value.length() > 0 && field.value !== "null" ? field.value : null; return field.value.length() > 0 && field.value != "null" ? field.value : null;
}; };
// Parse file attributes // Parse file attributes

34
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js
View File

@@ -6,9 +6,9 @@ var Filters =
*/ */
TYPE_MAP: TYPE_MAP:
{ {
"documents": '+(TYPE:"{http://www.alfresco.org/model/content/1.0}content" OR TYPE:"{http://www.alfresco.org/model/application/1.0}filelink" OR TYPE:"{http://www.alfresco.org/model/content/1.0}folder")', "documents": '+(TYPE:"content" OR TYPE:"app:filelink" OR TYPE:"folder")',
"folders": '+(TYPE:"{http://www.alfresco.org/model/content/1.0}folder" OR TYPE:"{http://www.alfresco.org/model/application/1.0}folderlink")', "folders": '+(TYPE:"folder" OR TYPE:"app:folderlink")',
"images": "-TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\" +@cm\\:content.mimetype:image/*" "images": '-TYPE:"thumbnail" +@cm\\:content.mimetype:image/*'
}, },
/** /**
@@ -45,7 +45,7 @@ var Filters =
limitResults: null, limitResults: null,
sort: [ sort: [
{ {
column: "@{http://www.alfresco.org/model/content/1.0}name", column: "@cm:name",
ascending: true ascending: true
}], }],
language: "lucene", language: "lucene",
@@ -72,21 +72,21 @@ var Filters =
var filterData = String(args.filterData), var filterData = String(args.filterData),
filterQuery = ""; filterQuery = "";
// Common types and aspects to filter from the UI // Common types and aspects to filter from the UI - known subtypes of cm:content and cm:folder
var filterQueryDefaults = var filterQueryDefaults =
" -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\"" + " -TYPE:\"thumbnail\"" +
" -TYPE:\"{http://www.alfresco.org/model/content/1.0}systemfolder\"" + " -TYPE:\"systemfolder\"" +
" -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forums\"" + " -TYPE:\"fm:forums\"" +
" -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forum\"" + " -TYPE:\"fm:forum\"" +
" -TYPE:\"{http://www.alfresco.org/model/forum/1.0}topic\"" + " -TYPE:\"fm:topic\"" +
" -TYPE:\"{http://www.alfresco.org/model/forum/1.0}post\"" + " -TYPE:\"fm:post\"" +
" -@cm\\:lockType:READ_ONLY_LOCK"; " -@cm\\:lockType:READ_ONLY_LOCK";
switch (String(filter)) switch (String(filter))
{ {
case "all": case "all":
filterQuery = "+PATH:\"" + parsedArgs.rootNode.qnamePath + "//*\""; filterQuery = "+PATH:\"" + parsedArgs.rootNode.qnamePath + "//*\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}folder\""; filterQuery += " +TYPE:\"content\"";
filterParams.query = filterQuery + filterQueryDefaults; filterParams.query = filterQuery + filterQueryDefaults;
break; break;
@@ -95,7 +95,7 @@ var Filters =
case "recentlyCreatedByMe": case "recentlyCreatedByMe":
case "recentlyModifiedByMe": case "recentlyModifiedByMe":
var onlySelf = (filter.indexOf("ByMe")) > 0 ? true : false, var onlySelf = (filter.indexOf("ByMe")) > 0 ? true : false,
dateField = (filter.indexOf("Created") > 0) ? "created" : "modified", dateField = (filter.indexOf("Modified") > 0) ? "modified" : "created",
ownerField = (dateField == "created") ? "creator" : "modifier"; ownerField = (dateField == "created") ? "creator" : "modifier";
// Default to 7 days - can be overridden using "days" argument // Default to 7 days - can be overridden using "days" argument
@@ -129,11 +129,11 @@ var Filters =
{ {
filterQuery += " +@cm\\:" + ownerField + ":\"" + person.properties.userName + '"'; filterQuery += " +@cm\\:" + ownerField + ":\"" + person.properties.userName + '"';
} }
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}folder\""; filterQuery += " +TYPE:\"content\"";
filterParams.sort = [ filterParams.sort = [
{ {
column: "@{http://www.alfresco.org/model/content/1.0}" + dateField, column: "@cm:" + dateField,
ascending: false ascending: false
}]; }];
filterParams.query = filterQuery + filterQueryDefaults; filterParams.query = filterQuery + filterQueryDefaults;
@@ -141,14 +141,14 @@ var Filters =
case "editingMe": case "editingMe":
filterQuery = "+PATH:\"" + parsedArgs.rootNode.qnamePath + "//*\""; filterQuery = "+PATH:\"" + parsedArgs.rootNode.qnamePath + "//*\"";
filterQuery += " +ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\""; filterQuery += " +ASPECT:\"workingcopy\"";
filterQuery += " +@cm\\:workingCopyOwner:\"" + person.properties.userName + '"'; filterQuery += " +@cm\\:workingCopyOwner:\"" + person.properties.userName + '"';
filterParams.query = filterQuery; filterParams.query = filterQuery;
break; break;
case "editingOthers": case "editingOthers":
filterQuery = "+PATH:\"" + parsedArgs.rootNode.qnamePath + "//*\""; filterQuery = "+PATH:\"" + parsedArgs.rootNode.qnamePath + "//*\"";
filterQuery += " +ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\""; filterQuery += " +ASPECT:\"workingcopy\"";
filterQuery += " -@cm\\:workingCopyOwner:\"" + person.properties.userName + '"'; filterQuery += " -@cm\\:workingCopyOwner:\"" + person.properties.userName + '"';
filterParams.query = filterQuery; filterParams.query = filterQuery;
break; break;

17
config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/usercontents.get.js
View File

@@ -4,7 +4,7 @@ function getContents(user, type, maxResults)
{ {
var padZeros = function padZeros(number) var padZeros = function padZeros(number)
{ {
return (number<10) ? '0'+number : number; return (number < 10) ? '0' + number : number;
} }
//set range to within last 28 days //set range to within last 28 days
var date = new Date(); var date = new Date();
@@ -12,15 +12,16 @@ function getContents(user, type, maxResults)
date.setDate(date.getDate() - 28); date.setDate(date.getDate() - 28);
var fromQuery = date.getFullYear() + "\\-" + padZeros((date.getMonth()+1)) + "\\-" + padZeros(date.getDate()); var fromQuery = date.getFullYear() + "\\-" + padZeros((date.getMonth()+1)) + "\\-" + padZeros(date.getDate());
var userType = (type=='created') ? 'creator' : 'modifier'; var userType = (type == 'created') ? 'creator' : 'modifier';
var query = "+PATH:\"/app:company_home/st:sites/*//*\" "+ var query = "+PATH:\"/app:company_home/st:sites/*//*\"" +
"+TYPE:\"{http://www.alfresco.org/model/content/1.0}content\" " + " +TYPE:\"content\"" +
"+@cm\\:" + userType + ":\"" + user + "\" " + " -TYPE:\"dl:dataListItem\"" +
"+@cm\\:" + type + ":[" + fromQuery + "T00\\:00\\:00 TO " + toQuery + "T23\\:59\\:59]" + " +@cm\\:" + userType + ":\"" + user + "\"" +
"-TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\""; " +@cm\\:" + type + ":[" + fromQuery + "T00\\:00\\:00 TO " + toQuery + "T23\\:59\\:59]" +
" -TYPE:\"thumbnail\"";
var nodes = search.luceneSearch(query, "cm:"+type, false, maxResults); var nodes = search.luceneSearch(query, "cm:" + type, false, maxResults);
//reset processed results (in search.lib.js) //reset processed results (in search.lib.js)
processedCache = {} processedCache = {}
return processResults(nodes, maxResults); return processResults(nodes, maxResults);