Skip to content

Commit 1b4653d

Browse files
jmontoyaajmontoyaa
committed
Fix typo, fix function name, remove unused code, use api_get_user_entity
1 parent ee0d2d4 commit 1b4653d

File tree

4 files changed

+17
-47
lines changed

4 files changed

+17
-47
lines changed

‎main/badge/assign.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
$skillRelSkill = $entityManager->getRepository('ChamiloCoreBundle:SkillRelSkill');
2929
$skillLevelRepo = $entityManager->getRepository('ChamiloSkillBundle:Level');
3030
$skillUserRepo = $entityManager->getRepository('ChamiloCoreBundle:SkillRelUser');
31-
/** @var User $user */
32-
$user = $entityManager->find('ChamiloUserBundle:User', $userId);
31+
$user = api_get_user_entity($userId);
3332

3433
if (!$user) {
3534
Display::addFlash(
@@ -184,7 +183,7 @@
184183
exit;
185184
}
186185

187-
$form->setDefaults(['user_name' => $user->getCompleteName()]);
186+
$form->setDefaults(['user_name' => $user->getCompleteNameWithUsername()]);
188187
$form->freeze(['user_name']);
189188

190189
if (api_is_drh()) {

‎main/inc/ajax/skill.ajax.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
break;
7878
case 'get_course_info_popup':
7979
$course_info = api_get_course_info($_REQUEST['code']);
80-
$courses = CourseManager::process_hot_course_item(
80+
$courses = CourseManager::processHotCourseItem(
8181
[
8282
['c_id' => $course_info['real_id']]
8383
]

‎main/inc/lib/course.lib.php‎

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4925,7 +4925,7 @@ public static function return_hot_courses($days = 30, $limit = 6)
49254925

49264926
if (Database::num_rows($result)) {
49274927
$courses = Database::store_result($result, 'ASSOC');
4928-
$courses = self::process_hot_course_item($courses, $my_course_code_list);
4928+
$courses = self::processHotCourseItem($courses, $my_course_code_list);
49294929
}
49304930

49314931
return $courses;
@@ -4936,7 +4936,7 @@ public static function return_hot_courses($days = 30, $limit = 6)
49364936
* @param array $my_course_code_list
49374937
* @return mixed
49384938
*/
4939-
public static function process_hot_course_item($courses, $my_course_code_list = array())
4939+
public static function processHotCourseItem($courses, $my_course_code_list = array())
49404940
{
49414941
$hotCourses = [];
49424942
$ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote';
@@ -4957,42 +4957,12 @@ public static function process_hot_course_item($courses, $my_course_code_list =
49574957
$my_course_code_list
49584958
);
49594959

4960-
$userRegisterdInCourse = self::is_user_subscribed_in_course($user_id, $course_info['code']);
4961-
$userRegisterdInCourseAsTeacher = self::is_course_teacher($user_id, $course_info['code']);
4962-
$userRegisterd = ($userRegisterdInCourse && $userRegisterdInCourseAsTeacher);
4963-
4964-
$my_course['is_registerd'] = $userRegisterd;
4965-
4960+
$userRegisteredInCourse = self::is_user_subscribed_in_course($user_id, $course_info['code']);
4961+
$userRegisteredInCourseAsTeacher = self::is_course_teacher($user_id, $course_info['code']);
4962+
$userRegistered = $userRegisteredInCourse && $userRegisteredInCourseAsTeacher;
4963+
$my_course['is_registered'] = $userRegistered;
49664964
$my_course['title_cut'] = cut($course_info['title'], 45);
4967-
// if user registered as student
4968-
/* if ($userRegisterdInCourse) {
4969-
$icon = '<em class="fa fa-graduation-cap"></em>';
4970-
$title = get_lang("AlreadyRegisteredToCourse");
4971-
$my_course['already_register_as'] = Display::tag(
4972-
'button',
4973-
$icon,
4974-
array(
4975-
'id' => 'register',
4976-
'class' => 'btn btn-default btn-sm',
4977-
'title' => $title,
4978-
'aria-label' => $title
4979-
)
4980-
);
4981-
} elseif ($userRegisterdInCourseAsTeacher) {
4982-
// if user registered as teacher
4983-
$icon = '<em class="fa fa-suitcase"></em>';
4984-
$title = get_lang("YouAreATeacherOfThisCourse");
4985-
$my_course['already_register_as'] = Display::tag(
4986-
'button',
4987-
$icon,
4988-
array(
4989-
'id' => 'register',
4990-
'class' => 'btn btn-default btn-sm',
4991-
'title' => $title,
4992-
'aria-label' => $title
4993-
)
4994-
);
4995-
} */
4965+
49964966

49974967
//Course visibility
49984968
if ($access_link && in_array('register', $access_link)) {

‎main/template/default/layout/hot_course_item.tpl‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
{% if item.title %}
33
<div class="col-xs-12 col-sm-6 col-md-4">
44
<div class="items items-hotcourse">
5-
65
<div class="image">
7-
{% if item.is_registerd %}
6+
{% if item.is_registered %}
87
<a title="{{ item.title}}" href="{{ item.course_public_url }}">
98
<img src="{{ item.course_image_large }}" class="img-responsive" alt="{{ item.title }}">
109
</a>
@@ -19,9 +18,11 @@
1918
</div>
2019
<div class="description">
2120
<div class="block-title">
22-
{% if item.is_registerd %}
21+
{% if item.is_registered or _u.is_admin %}
2322
<h4 class="title">
24-
<a alt="{{ item.title }}" title="{{ item.title }}" href="{{ item.course_public_url }}">{{ item.title_cut}}</a>
23+
<a alt="{{ item.title }}" title="{{ item.title }}" href="{{ item.course_public_url }}">
24+
{{ item.title_cut}}
25+
</a>
2526
</h4>
2627
{% else %}
2728
<h4 class="title" title="{{ item.title }}">
@@ -70,13 +71,13 @@
7071
</a>
7172
</h5>
7273
<p>{{ 'Teacher' | get_lang }}</p>
73-
</div>
74+
</div>
7475
{% elseif item.teachers | length <= 6 %}
7576
<a href="{{ teacher.url }}" class="ajax"
7677
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
7778
<img src="{{ teacher.avatar }}"/>
7879
</a>
79-
{% endif %}
80+
{% endif %}
8081
{% endfor %}
8182
{% endif %}
8283
</div>

0 commit comments

Comments
 (0)