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

Fix ticket mysql errors

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent ddccfa79ad
commit a63150045d
5 changed files with 136 additions and 30 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. 13
      main/ticket/categories.php
  2. 23
      main/ticket/priorities.php
  3. 19
      main/ticket/projects.php
  4. 36
      main/ticket/status.php
  5. 75
      src/Chamilo/TicketBundle/Entity/Ticket.php

13
main/ticket/categories.php
Unescape View File

@ -69,8 +69,13 @@ $interbreadcrumb[] = array(
switch ($action) {
case 'delete':
TicketManager::deleteCategory($id);
Display::addFlash(Display::return_message(get_lang('Deleted')));
$tickets = TicketManager::getTicketsFromCriteria(['category' => $id]);
if (empty($tickets)) {
TicketManager::deleteCategory($id);
Display::addFlash(Display::return_message(get_lang('Deleted')));
} else {
Display::addFlash(Display::return_message(get_lang('ThisItemIsRelatedToOtherTickets')));
}
header("Location: ".api_get_self().'?project_id='.$projectId);
exit;
break;
@ -148,9 +153,9 @@ switch ($action) {
function modify_filter($id, $params, $row)
{
$projectId = Session::read('project_id');
$result = '';
if (api_get_setting('ticket_allow_category_edition') === 'true') {
$result = Display::url(
$result .= Display::url(
Display::return_icon('edit.png', get_lang('Edit')),
"categories.php?action=edit&id={$row['id']}&project_id=".$projectId
);

23
main/ticket/priorities.php
Unescape View File

@ -43,12 +43,17 @@ $interbreadcrumb[] = array(
'name' => get_lang('Settings')
);
switch ($action) {
case 'delete':
TicketManager::deletePriority($id);
Display::addFlash(Display::return_message(get_lang('Deleted')));
$tickets = TicketManager::getTicketsFromCriteria(['priority' => $id]);
if (empty($tickets)) {
TicketManager::deletePriority($id);
Display::addFlash(Display::return_message(get_lang('Deleted')));
} else {
Display::addFlash(Display::return_message(get_lang('ThisItemIsRelatedToOtherTickets'), 'warning'));
}
header("Location: ".api_get_self());
exit;
break;
case 'add':
$toolName = get_lang('Add');
@ -122,10 +127,14 @@ function modify_filter($id, $params, $row)
api_get_self()."?action=edit&id={$row['id']}"
);
$result .= Display::url(
Display::return_icon('delete.png', get_lang('Delete')),
api_get_self()."?action=delete&id={$row['id']}"
);
$code = $row['code'];
if (!in_array($code, TicketManager::getDefaultPriorityList())) {
$result .= Display::url(
Display::return_icon('delete.png', get_lang('Delete')),
api_get_self()."?action=delete&id={$row['id']}"
);
}
return $result;
}

19
main/ticket/projects.php
Unescape View File

@ -10,8 +10,6 @@ require_once __DIR__.'/../inc/global.inc.php';
api_protect_admin_script(true);
//$toolName = get_lang('Project');
$libPath = api_get_path(LIBRARY_PATH);
$webLibPath = api_get_path(WEB_LIBRARY_PATH);
@ -50,9 +48,15 @@ $interbreadcrumb[] = array(
switch ($action) {
case 'delete':
TicketManager::deleteProject($id);
Display::addFlash(Display::return_message(get_lang('Deleted')));
$tickets = TicketManager::getTicketsFromCriteria(['project' => $id]);
if (empty($tickets)) {
TicketManager::deleteProject($id);
Display::addFlash(Display::return_message(get_lang('Deleted')));
} else {
Display::addFlash(Display::return_message(get_lang('ThisItemIsRelatedToOtherTickets')));
}
header("Location: ".api_get_self());
exit;
break;
case 'add':
$toolName = get_lang('Add');
@ -86,8 +90,9 @@ switch ($action) {
$form->setDefaults([
'name' => $item->getName(),
'description' => $item->getDescription()]
);
'description' => $item->getDescription()
]);
$formToString = $form->returnForm();
if ($form->validate()) {
$values =$form->getSubmitValues();
@ -98,7 +103,7 @@ switch ($action) {
'sys_lastedit_datetime' => api_get_utc_datetime(),
'sys_lastedit_user_id' => api_get_user_id()
];
$cat = TicketManager::updateProject($_GET['id'], $params);
TicketManager::updateProject($_GET['id'], $params);
Display::addFlash(Display::return_message(get_lang('Updated')));
header("Location: ".api_get_self());
exit;

36
main/ticket/status.php
Unescape View File

@ -44,15 +44,22 @@ $interbreadcrumb[] = array(
switch ($action) {
case 'delete':
TicketManager::deleteStatus($id);
Display::addFlash(Display::return_message(get_lang('Deleted')));
$tickets = TicketManager::getTicketsFromCriteria(['status' => $id]);
if (empty($tickets)) {
TicketManager::deleteStatus($id);
Display::addFlash(Display::return_message(get_lang('Deleted')));
} else {
Display::addFlash(Display::return_message(get_lang('ThisItemIsRelatedToOtherTickets'), 'warning'));
}
header("Location: ".api_get_self());
exit;
break;
case 'add':
$toolName = get_lang('Add');
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'ticket/status.php',
'name' => get_lang('Categories')
'name' => get_lang('Status')
);
$url = api_get_self().'?action=add';
$form = TicketManager::getStatusForm($url);
@ -74,8 +81,8 @@ switch ($action) {
case 'edit':
$toolName = get_lang('Edit');
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'ticket/categories.php',
'name' => get_lang('Categories')
'url' => api_get_path(WEB_CODE_PATH).'ticket/status.php',
'name' => get_lang('Status')
);
$url = api_get_self().'?action=edit&id='.$id;
$form = TicketManager::getStatusForm($url);
@ -83,8 +90,8 @@ switch ($action) {
$item = TicketManager::getStatus($_GET['id']);
$form->setDefaults([
'name' => $item->getName(),
'description' => $item->getDescription()]
);
'description' => $item->getDescription()
]);
$formToString = $form->returnForm();
if ($form->validate()) {
$values =$form->getSubmitValues();
@ -115,15 +122,20 @@ $isAdmin = api_is_platform_admin();
*/
function modify_filter($id, $params, $row)
{
$id = $row['id'];
$code = $row['code'];
$result = Display::url(
Display::return_icon('edit.png', get_lang('Edit')),
api_get_self()."?action=edit&id={$row['id']}"
api_get_self()."?action=edit&id={$id}"
);
$result .= Display::url(
Display::return_icon('delete.png', get_lang('Delete')),
api_get_self()."?action=delete&id={$row['id']}"
);
if (!in_array($code, TicketManager::getDefaultStatusList())) {
$result .= Display::url(
Display::return_icon('delete.png', get_lang('Delete')),
api_get_self()."?action=delete&id={$id}"
);
}
return $result;
}

75
src/Chamilo/TicketBundle/Entity/Ticket.php
Unescape View File

@ -173,4 +173,79 @@ class Ticket
*/
protected $lastEditDateTime;
/**
* @return int
*/
public function getId()
{
return $this->id;
}
/**
* @param int $id
* @return Ticket
*/
public function setId($id)
{
$this->id = $id;
return $this;
}
/**
* @return string
*/
public function getCode()
{
return $this->code;
}
/**
* @param string $code
* @return Ticket
*/
public function setCode($code)
{
$this->code = $code;
return $this;
}
/**
* @return string
*/
public function getSubject()
{
return $this->subject;
}
/**
* @param string $subject
* @return Ticket
*/
public function setSubject($subject)
{
$this->subject = $subject;
return $this;
}
/**
* @return string
*/
public function getMessage()
{
return $this->message;
}
/**
* @param string $message
* @return Ticket
*/
public function setMessage($message)
{
$this->message = $message;
return $this;
}
}

Write Preview
Loading…
Cancel
Save