chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ticket: Internal: fix name to title conversion errors in ticket management

Browse Source
pull/5437/head
NicoDucou 1 year ago
parent 221ea44af2
commit e77aa98367
4 changed files with 34 additions and 34 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 58
      public/main/inc/lib/TicketManager.php
  2. 4
      public/main/ticket/new_ticket.php
  3. 2
      public/main/ticket/ticket_details.php
  4. 4
      public/main/ticket/tickets.php

58
public/main/inc/lib/TicketManager.php
Unescape View File

@ -87,7 +87,7 @@ class TicketManager
public static function getCategories($from, $numberItems, $column, $direction) public static function getCategories($from, $numberItems, $column, $direction)
{ {
$table = Database::get_main_table(TABLE_TICKET_CATEGORY); $table = Database::get_main_table(TABLE_TICKET_CATEGORY);
$sql = "SELECT id, name, description, total_tickets $sql = "SELECT id, title, description, total_tickets
FROM $table"; FROM $table";
if (!in_array($direction, ['ASC', 'DESC'])) { if (!in_array($direction, ['ASC', 'DESC'])) {
@ -118,7 +118,7 @@ class TicketManager
{ {
$table = Database::get_main_table(TABLE_TICKET_CATEGORY); $table = Database::get_main_table(TABLE_TICKET_CATEGORY);
$id = (int) $id; $id = (int) $id;
$sql = "SELECT id, name, description, total_tickets $sql = "SELECT id, title, description, total_tickets
FROM $table WHERE id = $id"; FROM $table WHERE id = $id";
$result = Database::query($sql); $result = Database::query($sql);
@ -518,7 +518,7 @@ class TicketManager
if (empty($usersInCategory)) { if (empty($usersInCategory)) {
$subject = sprintf( $subject = sprintf(
get_lang('Warning: No one has been assigned to category %s'), get_lang('Warning: No one has been assigned to category %s'),
$categoryInfo['name'] $categoryInfo['title']
); );
if ('true' === api_get_setting('ticket_send_warning_to_all_admins')) { if ('true' === api_get_setting('ticket_send_warning_to_all_admins')) {
@ -527,7 +527,7 @@ class TicketManager
get_lang( get_lang(
'A notification was sent to the administrators to report this category has no user assigned' 'A notification was sent to the administrators to report this category has no user assigned'
), ),
$categoryInfo['name'] $categoryInfo['title']
), ),
null, null,
false false
@ -815,7 +815,7 @@ class TicketManager
$column = 'ticket_id'; $column = 'ticket_id';
break; break;
case 1: case 1:
$column = 'status_name'; $column = 'status_title';
break; break;
case 2: case 2:
$column = 'start_date'; $column = 'start_date';
@ -824,7 +824,7 @@ class TicketManager
$column = 'sys_lastedit_datetime'; $column = 'sys_lastedit_datetime';
break; break;
case 4: case 4:
$column = 'category_name'; $column = 'category_title';
break; break;
case 5: case 5:
$column = 'sys_insert_user_id'; $column = 'sys_insert_user_id';
@ -845,11 +845,11 @@ class TicketManager
$sql = "SELECT DISTINCT $sql = "SELECT DISTINCT
ticket.*, ticket.*,
ticket.id ticket_id, ticket.id ticket_id,
status.name AS status_name, status.title AS status_title,
ticket.start_date, ticket.start_date,
ticket.sys_lastedit_datetime, ticket.sys_lastedit_datetime,
cat.name AS category_name, cat.title AS category_title,
priority.name AS priority_name, priority.title AS priority_title,
ticket.total_messages AS total_messages, ticket.total_messages AS total_messages,
ticket.message AS message, ticket.message AS message,
ticket.subject AS subject, ticket.subject AS subject,
@ -882,9 +882,9 @@ class TicketManager
ticket.message LIKE '%$keyword%' OR ticket.message LIKE '%$keyword%' OR
ticket.keyword LIKE '%$keyword%' OR ticket.keyword LIKE '%$keyword%' OR
ticket.source LIKE '%$keyword%' OR ticket.source LIKE '%$keyword%' OR
cat.name LIKE '%$keyword%' OR cat.title LIKE '%$keyword%' OR
status.name LIKE '%$keyword%' OR status.title LIKE '%$keyword%' OR
priority.name LIKE '%$keyword%' OR priority.title LIKE '%$keyword%' OR
ticket.personal_email LIKE '%$keyword%' ticket.personal_email LIKE '%$keyword%'
)"; )";
} }
@ -989,10 +989,10 @@ class TicketManager
if ($isAdmin) { if ($isAdmin) {
$ticket = [ $ticket = [
$icon.' '.Security::remove_XSS($row['subject']), $icon.' '.Security::remove_XSS($row['subject']),
$row['status_name'], $row['status_title'],
$row['start_date'], $row['start_date'],
$row['sys_lastedit_datetime'], $row['sys_lastedit_datetime'],
$row['category_name'], $row['category_title'],
$name, $name,
$row['assigned_last_user'], $row['assigned_last_user'],
$row['total_messages'], $row['total_messages'],
@ -1000,10 +1000,10 @@ class TicketManager
} else { } else {
$ticket = [ $ticket = [
$icon.' '.Security::remove_XSS($row['subject']), $icon.' '.Security::remove_XSS($row['subject']),
$row['status_name'], $row['status_title'],
$row['start_date'], $row['start_date'],
$row['sys_lastedit_datetime'], $row['sys_lastedit_datetime'],
$row['category_name'], $row['category_title'],
]; ];
} }
if ($isAdmin) { if ($isAdmin) {
@ -1189,9 +1189,9 @@ class TicketManager
$sql = "SELECT $sql = "SELECT
ticket.*, ticket.*,
cat.name, cat.title,
status.name as status, status.title as status,
priority.name priority priority.title priority
FROM $table_support_tickets ticket FROM $table_support_tickets ticket
INNER JOIN $table_support_category cat INNER JOIN $table_support_category cat
ON (cat.id = ticket.category_id) ON (cat.id = ticket.category_id)
@ -1680,9 +1680,9 @@ class TicketManager
ticket.code, ticket.code,
ticket.sys_insert_datetime, ticket.sys_insert_datetime,
ticket.sys_lastedit_datetime, ticket.sys_lastedit_datetime,
cat.name as category, cat.title as category,
CONCAT(user.lastname,' ', user.firstname) AS fullname, CONCAT(user.lastname,' ', user.firstname) AS fullname,
status.name as status, status.title as status,
ticket.total_messages as messages, ticket.total_messages as messages,
ticket.assigned_last_user as responsable ticket.assigned_last_user as responsable
FROM $table_support_tickets ticket, FROM $table_support_tickets ticket,
@ -1997,7 +1997,7 @@ class TicketManager
public static function addProject($params) public static function addProject($params)
{ {
$project = new TicketProject(); $project = new TicketProject();
$project->setTitle($params['name']); $project->setTitle($params['title']);
$project->setDescription($params['description']); $project->setDescription($params['description']);
$project->setInsertUserId(api_get_user_id()); $project->setInsertUserId(api_get_user_id());
@ -2022,7 +2022,7 @@ class TicketManager
public static function updateProject($id, $params) public static function updateProject($id, $params)
{ {
$project = self::getProject($id); $project = self::getProject($id);
$project->setTitle($params['name']); $project->setTitle($params['title']);
$project->setDescription($params['description']); $project->setDescription($params['description']);
$project->setLastEditDateTime(new DateTime($params['sys_lastedit_datetime'])); $project->setLastEditDateTime(new DateTime($params['sys_lastedit_datetime']));
$project->setLastEditUserId($params['sys_lastedit_user_id']); $project->setLastEditUserId($params['sys_lastedit_user_id']);
@ -2117,8 +2117,8 @@ class TicketManager
public static function addStatus($params) public static function addStatus($params)
{ {
$item = new TicketStatus(); $item = new TicketStatus();
$item->setCode(URLify::filter($params['name'])); $item->setCode(URLify::filter($params['title']));
$item->setTitle($params['name']); $item->setTitle($params['title']);
$item->setDescription($params['description']); $item->setDescription($params['description']);
Database::getManager()->persist($item); Database::getManager()->persist($item);
@ -2142,7 +2142,7 @@ class TicketManager
public static function updateStatus($id, $params) public static function updateStatus($id, $params)
{ {
$item = self::getStatus($id); $item = self::getStatus($id);
$item->setTitle($params['name']); $item->setTitle($params['title']);
$item->setDescription($params['description']); $item->setDescription($params['description']);
Database::getManager()->persist($item); Database::getManager()->persist($item);
@ -2217,8 +2217,8 @@ class TicketManager
{ {
$item = new TicketPriority(); $item = new TicketPriority();
$item $item
->setCode(URLify::filter($params['name'])) ->setCode(URLify::filter($params['title']))
->setTitle($params['name']) ->setTitle($params['title'])
->setDescription($params['description']) ->setDescription($params['description'])
->setColor('') ->setColor('')
->setInsertUserId(api_get_user_id()) ->setInsertUserId(api_get_user_id())
@ -2246,7 +2246,7 @@ class TicketManager
public static function updatePriority($id, $params) public static function updatePriority($id, $params)
{ {
$item = self::getPriority($id); $item = self::getPriority($id);
$item->setTitle($params['name']); $item->setTitle($params['title']);
$item->setDescription($params['description']); $item->setDescription($params['description']);
Database::getManager()->persist($item); Database::getManager()->persist($item);

4
public/main/ticket/new_ticket.php
Unescape View File

@ -105,7 +105,7 @@ function add_image_form() {
$projectId = isset($_GET['project_id']) ? (int) $_GET['project_id'] : 0; $projectId = isset($_GET['project_id']) ? (int) $_GET['project_id'] : 0;
$types = TicketManager::get_all_tickets_categories($projectId, 'category.name ASC'); $types = TicketManager::get_all_tickets_categories($projectId, 'category.title ASC');
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
var projects = '.js_array($types, 'projects', 'project_id').' var projects = '.js_array($types, 'projects', 'project_id').'
var course_required = '.js_array($types, 'course_required', 'course_required').' var course_required = '.js_array($types, 'course_required', 'course_required').'
@ -182,7 +182,7 @@ $userId = api_get_user_id();
// Category List // Category List
$categoryList = []; $categoryList = [];
foreach ($types as $type) { foreach ($types as $type) {
$categoryList[$type['category_id']] = $type['name'].': '.$type['description']; $categoryList[$type['category_id']] = $type['title'].': '.$type['description'];
} }
// Status List // Status List

2
public/main/ticket/ticket_details.php
Unescape View File

@ -367,7 +367,7 @@ echo '<table width="100%">
</td> </td>
</tr> </tr>
<tr> <tr>
<td><p><b>'.get_lang('Category').': </b>'.$ticket['ticket']['name'].'</p></td> <td><p><b>'.get_lang('Category').': </b>'.$ticket['ticket']['title'].'</p></td>
</tr> </tr>
<tr> <tr>
<td><p '.$bold.'><b>'.get_lang('Status').':</b> '.$ticket['ticket']['status'].'</p></td> <td><p '.$bold.'><b>'.get_lang('Status').':</b> '.$ticket['ticket']['status'].'</p></td>

4
public/main/ticket/tickets.php
Unescape View File

@ -182,7 +182,7 @@ if (!empty($projectId)) {
$selectTypes = []; $selectTypes = [];
$types = TicketManager::get_all_tickets_categories($projectId); $types = TicketManager::get_all_tickets_categories($projectId);
foreach ($types as $type) { foreach ($types as $type) {
$selectTypes[$type['category_id']] = $type['name']; $selectTypes[$type['category_id']] = $type['title'];
} }
$admins = UserManager::getUserListLike( $admins = UserManager::getUserListLike(
@ -199,7 +199,7 @@ if (!empty($projectId)) {
$status = TicketManager::get_all_tickets_status(); $status = TicketManager::get_all_tickets_status();
$selectStatus = []; $selectStatus = [];
foreach ($status as $stat) { foreach ($status as $stat) {
$selectStatus[$stat['id']] = $stat['name']; $selectStatus[$stat['id']] = $stat['title'];
} }
$selectPriority = TicketManager::getPriorityList(); $selectPriority = TicketManager::getPriorityList();

Write Preview
Loading…
Cancel
Save