Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions public/main/inc/lib/TicketManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -1353,25 +1353,23 @@ public static function update_message_status($ticketId, $userId)
$table_support_tickets = Database::get_main_table(TABLE_TICKET_TICKET);
$now = api_get_utc_datetime();
$sql = "UPDATE $table_support_messages
SET
status = 'LEI',
sys_lastedit_user_id ='".api_get_user_id()."',
sys_lastedit_datetime ='".$now."'
WHERE ticket_id = $ticketId ";
SET
status = 'LEI',
sys_lastedit_user_id = " . (int) api_get_user_id() . ",
sys_lastedit_datetime = '$now'
WHERE ticket_id = $ticketId";

if (api_is_platform_admin()) {
$sql .= " AND sys_insert_user_id = '$userId'";
$sql .= " AND sys_insert_user_id = $userId";
} else {
$sql .= " AND sys_insert_user_id != '$userId'";
$sql .= " AND sys_insert_user_id != $userId";
}
$result = Database::query($sql);
if (Database::affected_rows($result) > 0) {
Database::query(
"UPDATE $table_support_tickets SET
status_id = ".self::STATUS_PENDING."
WHERE id = $ticketId AND status_id = ".self::STATUS_NEW
);

$sql2 = "UPDATE $table_support_tickets
SET status_id = " . self::STATUS_PENDING . "
WHERE id = $ticketId AND status_id = " . self::STATUS_NEW;
Database::query($sql2);
return true;
}

Expand Down Expand Up @@ -2454,8 +2452,6 @@ public static function getDefaultPriorityList()
self::PRIORITY_NORMAL,
self::PRIORITY_HIGH,
self::PRIORITY_LOW,
self::STATUS_CLOSED,
self::STATUS_FORWARDED,
];
}

Expand Down
7 changes: 3 additions & 4 deletions src/CoreBundle/DataFixtures/TicketFixtures.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ public function load(ObjectManager $manager): void
->setInsertUserId($adminId)
;

$isRequired = 6 === $i;
$ticketCategory->setCourseRequired($isRequired);
$ticketCategory->setCourseRequired(6 === $i);

$manager->persist($ticketCategory);
$i++;
Expand All @@ -72,7 +71,7 @@ public function load(ObjectManager $manager): void
$ticketPriority = new TicketPriority();
$ticketPriority
->setTitle($priority)
->setCode($code)
->setCode((string) $code)
->setInsertUserId($adminId)
;

Expand All @@ -94,7 +93,7 @@ public function load(ObjectManager $manager): void
$ticketStatus = new TicketStatus();
$ticketStatus
->setTitle($status)
->setCode($code)
->setCode((string) $code)
;
$manager->persist($ticketStatus);
}
Expand Down
36 changes: 3 additions & 33 deletions src/CoreBundle/Entity/TicketPriority.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,11 @@ public function __construct()
$this->urgency = '';
}

/**
* @return int
*/
public function getId()
{
return $this->id;
}

/**
* @return string
*/
public function getTitle()
{
return $this->title;
Expand All @@ -82,39 +76,30 @@ public function setTitle(string $title): self
return $this;
}

/**
* @return string
*/
public function getCode()
{
return $this->code;
}

public function setCode(string $code): self
public function setCode(string|int $code): self
{
$this->code = $code;
$this->code = (string) $code;

return $this;
}

/**
* @return string
*/
public function getDescription()
{
return $this->description;
}

public function setDescription(string $description): self
public function setDescription(?string $description): self
{
$this->description = $description;

return $this;
}

/**
* @return string
*/
public function getColor()
{
return $this->color;
Expand All @@ -127,9 +112,6 @@ public function setColor(string $color): self
return $this;
}

/**
* @return string
*/
public function getUrgency()
{
return $this->urgency;
Expand All @@ -142,9 +124,6 @@ public function setUrgency(string $urgency): self
return $this;
}

/**
* @return int
*/
public function getInsertUserId()
{
return $this->insertUserId;
Expand All @@ -157,9 +136,6 @@ public function setInsertUserId(int $insertUserId): self
return $this;
}

/**
* @return DateTime
*/
public function getInsertDateTime()
{
return $this->insertDateTime;
Expand All @@ -172,9 +148,6 @@ public function setInsertDateTime(DateTime $insertDateTime): self
return $this;
}

/**
* @return int
*/
public function getLastEditUserId()
{
return $this->lastEditUserId;
Expand All @@ -187,9 +160,6 @@ public function setLastEditUserId(int $lastEditUserId): self
return $this;
}

/**
* @return DateTime
*/
public function getLastEditDateTime()
{
return $this->lastEditDateTime;
Expand Down
18 changes: 3 additions & 15 deletions src/CoreBundle/Entity/TicketStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,23 @@ class TicketStatus
#[ORM\JoinColumn(name: 'access_url_id', referencedColumnName: 'id', nullable: true)]
protected ?AccessUrl $accessUrl = null;

/**
* @return int
*/
public function getId()
{
return $this->id;
}

/**
* @return string
*/
public function getCode()
{
return $this->code;
}

public function setCode(string $code): self
public function setCode(string|int $code): self
{
$this->code = $code;
$this->code = (string) $code;

return $this;
}

/**
* @return string
*/
public function getTitle()
{
return $this->title;
Expand All @@ -71,15 +62,12 @@ public function setTitle(string $title): self
return $this;
}

/**
* @return string
*/
public function getDescription()
{
return $this->description;
}

public function setDescription(string $description): self
public function setDescription(?string $description): self
{
$this->description = $description;

Expand Down
Loading