Merge pull request oaeproject#2105 from christianv/SAKIII-5600

SAKIII-5600 - fix to make .versions.json work
christianvuerings · May 10, 2012 · 81377b9 · 81377b9
2 parents 905e3b6 + c731d35
commit 81377b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 25 deletions.
diff --git a/devwidgets/versions/javascript/versions.js b/devwidgets/versions/javascript/versions.js
@@ -78,9 +78,10 @@ require(["jquery", "underscore", "sakai/sakai.api.core"], function($, _, sakai){
         // RENDERING //
         ///////////////
 
-        var renderVersions = function(){
+        var renderVersions = function(users) {
             $(versionsContainer, $rootel).html(sakai.api.Util.TemplateRenderer(versionsTemplate, {
                 'itemsBeforeScroll': itemsBeforeScroll,
+                'users': users,
                 "data": versions,
                 "sakai": sakai,
                 "currentPage": currentPageShown
@@ -97,34 +98,12 @@ require(["jquery", "underscore", "sakai/sakai.api.core"], function($, _, sakai){
             }
         };
 
-        var setUsername = function(u, users) {
-            $(versions).each(function(index, val){
-               var userId = val["_lastModifiedBy"] || val["sakai:pool-content-created-for"];
-               if (userId === u){
-                    val["username"] = sakai.api.Util.applyThreeDots(sakai.api.User.getDisplayName(users[u]), 80, null, "s3d-regular-links versions_updater");
-               }
-            });
-        };
-
         var parseVersions = function(success, data){
-            var userIds = [];
             $.each(data.versions, function(index, version){
                 version.versionId = index;
                 versions.push(version);
-                userIds.push(version["_lastModifiedBy"] || version["sakai:pool-content-created-for"]);
             });
-            if (userIds.length) {
-                sakai.api.User.getMultipleUsers(userIds, function(users){
-                    for (var u in users) {
-                        if (users.hasOwnProperty(u)) {
-                            setUsername(u, users);
-                        }
-                    }
-                    renderVersions();
-                });
-            } else {
-                renderVersions();
-            }
+            renderVersions(data.users);
         };
 
 

diff --git a/devwidgets/versions/versions.html b/devwidgets/versions/versions.html
@@ -24,8 +24,10 @@
                 {for version in data}
                     <li class="versions_version_item {if version_index == 0} versions_selected {else} versions_divider{/if}" data-versionId="${version_index}" data-version="${version.versionId}" data-pooleditemname="${version["sakai:pooled-content-file-name"]|safeOutput}">
                         {var date = sakai.api.Util.parseSakaiDate(version["_versionNumber"]).toString().split(" ")}
+                        {var userid = version['sakai:pool-content-created-for'] || version._lastModifiedBy}
+                        {var username = sakai.api.Util.applyThreeDots(sakai.api.User.getDisplayName(users[userid]), 80)}
                         <span class="versions_date">${date[1]} ${date[2]}, ${date[4].substring(0,5)}</span>
-                        <a href="javascript:;" class="s3d-regular-links versions_updater">${version["username"]}</a>
+                        <a href="/~${userid|safeURL}" class="s3d-regular-links versions_updater">${username}</a>
                         {if !sakai_global.content_profile || sakai_global.content_profile.content_data.data.mimeType == "x-sakai/document"}
                             <button type="button" class="s3d-button s3d-header-button s3d-header-smaller-button versions_restore_version">__MSG__RESTORE__</button>
                         {else}