Browse Source

Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x

José Loguercio 7 years ago
parent
commit
1cf9be08f0

+ 4 - 8
main/inc/lib/banner.lib.php

@@ -608,13 +608,9 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
 
     // part 1: Course Homepage. If we are in a course then the first breadcrumb is a link to the course homepage
     if (!empty($courseInfo) && !isset($_GET['hide_course_breadcrumb'])) {
-        $sessionId = api_get_session_id();
-        $sessionName = '';
-        if (!empty($sessionId)) {
-            /** @var \Chamilo\CoreBundle\Entity\Session $session */
-            $session = Database::getManager()->find('ChamiloCoreBundle:Session', $sessionId);
-            $sessionName = $session ? ' ('.cut($session->getName(), MAX_LENGTH_BREADCRUMB).')' : '';
-        }
+        /** @var \Chamilo\CoreBundle\Entity\Session $session */
+        $session = Database::getManager()->find('ChamiloCoreBundle:Session', api_get_session_id());
+        $sessionName = $session ? ' ('.cut($session->getName(), MAX_LENGTH_BREADCRUMB).')' : '';
 
         $courseInfo['name'] = api_htmlentities($courseInfo['name']);
         $course_title = cut($courseInfo['name'], MAX_LENGTH_BREADCRUMB);
@@ -648,7 +644,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
                 )
                 .' '.$course_title.$sessionName;
 
-                if (!empty($sessionId) && ($session->getDuration() && !api_is_allowed_to_edit())) {
+                if ($session && ($session->getDuration() && !api_is_allowed_to_edit())) {
                     $daysLeft = SessionManager::getDayLeftInSession(
                         ['id' => $session->getId(), 'duration' => $session->getDuration()],
                         $user_id

+ 2 - 2
main/survey/reporting.php

@@ -196,7 +196,7 @@ if (!isset($_GET['action']) ||
             null,
             ICON_SIZE_MEDIUM
         ).'<h4>'.get_lang('DetailedReportByUser').'</h4><p>'.get_lang('DetailedReportByUserDetail').'</p>',
-        $url.'action=comparativereport&survey_id='.$survey_id.'&'.$cidReq,
+        $url.'action=userreport&survey_id='.$survey_id.'&'.$cidReq,
         array('class' => 'list-group-item')
     );
 
@@ -218,7 +218,7 @@ if (!isset($_GET['action']) ||
             null,
             ICON_SIZE_MEDIUM
         ).'<h4>'.get_lang('CompleteReport').'</h4><p>'.get_lang('CompleteReportDetail').'</p>',
-        $url.'action=comparativereport&survey_id='.$survey_id.'&'.$cidReq,
+        $url.'action=completereport&survey_id='.$survey_id.'&'.$cidReq,
         array('class' => 'list-group-item')
     );
 

+ 2 - 0
main/template/default/layout/page.tpl

@@ -58,6 +58,8 @@
     {% if show_footer == true %}
 	{% include template ~ "/layout/page_footer.tpl" %}
     {% endif %}
+
+    {% include template ~ '/layout/footer.js.tpl' %}
     </div>
   </body>
 </html>

+ 0 - 2
main/template/default/layout/page_footer.tpl

@@ -90,6 +90,4 @@
     </div>
 </div>
 
-{% include template ~ '/layout/footer.js.tpl' %}
-
 {{ execution_stats }}