Small fixes to dynamic documents loader - refs BT#2773

main/inc/lib/document.lib.php

@@ -2550,13 +2550,13 @@ return 'application/octet-stream';
 	    	$return .= Display::url(get_lang('NewDocument'), api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_DOCUMENT.'&lp_id='.$_SESSION['oLP']->lp_id);
 	    	$return .= '</div>';
     	} else {
-    		$return .= Display::div(Display::url(Display::return_icon('delete.png', get_lang('Close'), array(), 22), '#', array('id'=>'close_div_'.$course_info['real_id'].'_'.$session_id,'class' =>'close_div')), array('style' => 'position:absolute;right:10px'));
+    		$return .= Display::div(Display::url(Display::return_icon('delete.png', get_lang('Close'), array(), 22), '#', array('id'=>'close_div_'.$course_info['real_id'].'_'.$current_session_id,'class' =>'close_div')), array('style' => 'position:absolute;right:10px'));
     	}
     	
     	// If you want to debug it, I advise you to do "echo" on the eval statements.
     	if (!empty($resources) && $user_in_course) {
 	    	foreach ($resources as $resource) {
-	    		$item_info = api_get_item_property_info($course_info['real_id'], 'document', $resource['id'], $session_id);
+	    		$item_info = api_get_item_property_info($course_info['real_id'], 'document', $resource['id'], $current_session_id);
 	    		
 	    		if (empty($item_info)) {
 	    			continue;

user_portal.php

@@ -207,11 +207,12 @@ if ($load_dirs) {
 		$(".document_preview").click(function() {
 			var my_id = this.id;
 			course_id = my_id.split("_")[2];
+            sess_id = my_id.split("_")[3];
 			
 			//showing div
 			$(".document_preview_container").hide();
 					
-			$("#document_result_" +course_id).show();	
+			$("#document_result_" +course_id+"_"+sess_id).show();	
 			
 			//Loading		
 			var image = $("img", this);
@@ -222,7 +223,7 @@ if ($load_dirs) {
 				data: "course_id="+course_id,
 	            success: function(return_value) {
 	            	image.attr("src", "'.$folder_icon.'");
-	            	$("#document_result_" +course_id).html(return_value);
+	            	$("#document_result_" +course_id+"_"+sess_id).html(return_value);
 	            	
 	            },
 	        });