pull/2487/head
jmontoyaa 8 years ago
parent 877ccde207
commit 3bb8c1e057
  1. 14
      main/mySpace/student.php
  2. 6
      main/mySpace/teachers.php
  3. 4
      tests/behat/features/createUser.feature

@ -162,11 +162,17 @@ function get_users($from, $limit, $column, $direction)
$row[] = $string_date;
if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
$detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$sessionId.'">
'.Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']).'</a>';
$detailsLink = Display::url(
Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
"myStudents.php?student=$student_id&id_coach=$coach_id&id_session=$sessionId",
['id' => 'details_'.$student_data['username']]
);
} else {
$detailsLink = '<a href="myStudents.php?student='.$student_id.'">
'.Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']).'</a>';
$detailsLink = Display::url(
Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
"myStudents.php?student=$student_id",
['id' => 'details_'.$student_data['username']]
);
}
$lostPasswordLink = '';

@ -164,12 +164,14 @@ function get_users($from, $limit, $column, $direction)
if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
$detailsLink = Display::url(
Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
"myStudents.php?student=$student_id&id_coach=$coach_id&id_session=$sessionId"
"myStudents.php?student=$student_id&id_coach=$coach_id&id_session=$sessionId",
['id' => 'details_'.$student_data['username']]
);
} else {
$detailsLink = Display::url(
Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
"myStudents.php?student=$student_id&origin=teacher_details"
"myStudents.php?student=$student_id&origin=teacher_details",
['id' => 'details_'.$student_data['username']]
);
}
$row[] = $detailsLink;

@ -99,7 +99,7 @@ Feature: Users management as admin
Given I am logged as "hrm"
And I am on "/main/mySpace/teachers.php"
And I should see "teacher lastname"
And I follow "Details teacher"
And I follow "details_teacher"
And wait for the page to be loaded
And I follow "Login as"
And wait for the page to be loaded
@ -109,7 +109,7 @@ Feature: Users management as admin
Given I am logged as "hrm"
And I am on "/main/mySpace/student.php"
And I should see "student lastname"
And I follow "Details student"
And I follow "details_student"
And wait for the page to be loaded
And I follow "Login as"
And wait for the page to be loaded

Loading…
Cancel
Save