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

Merged 5.0.N (5.0.3) to HEAD (5.1)

Browse Source 
109517: SHA-91: Recent sites should be listed in fixed order
      - Fixed incorrect order of the recent sites in "Move/Copy to" picker.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-08-05 07:59:05 +00:00
parent abeb7991bc
commit ce73f63b14
1 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
config/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.js
View File

@@ -57,29 +57,46 @@ function main()
}
}
var i = 0;
while (i < sites.length)
{
for (var key in filterObj)
{
if (filterObj[key] == sites[i].shortName || key == sites[i].shortName)
{
if (filter != "favourites" ||
filterObj[key] == true)
{
filteredSites.push(sites[i]);
// If the caller of this webscript has requested a specific result size (non-zero) then do not return more than they asked for
if (size > 0 && filteredSites.length == size)
{
break;
}
}
}
}
i++;
}
var i = 0;
while (i < sites.length)
{
var filterObjIndex = 0;
for (var key in filterObj)
{
if (filterObj[key] == sites[i].shortName || key == sites[i].shortName)
{
if (filter != "favourites" )
{
// ACE-379 fix. Fill filteredSites array according to the position of elements in the array 'filterObj'
filteredSites[filterObjIndex] = sites[i];
// If the caller of this webscript has requested a specific result size (non-zero) then do not return
// more than they asked for
if (size > 0 && filteredSites.length == size)
{
break;
}
}
// if filter equals to "favourites" and site is favourite.
else
{
if (filterObj[key] == true)
{
filteredSites.push(sites[i]);
}
// If the caller of this webscript has requested a specific result size (non-zero) then do not return
// more than they asked for
if (size > 0 && filteredSites.length == size)
{
break;
}
}
}
filterObjIndex++;
}
i++;
}
model.sites = filteredSites;
}