diff --git a/application/utils.inc.php b/application/utils.inc.php index 68c7d40b6..26922f4a4 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -189,6 +189,7 @@ class utils /** * Returns an absolute URL to the current page * @param $bQueryString bool True to also get the query string, false otherwise + * @param $bForceHTTPS bool True to force HTTPS, false otherwise * @return string The absolute URL to the current page */ static public function GetAbsoluteUrl($bQueryString = true, $bForceHTTPS = false) @@ -248,6 +249,18 @@ class utils return $sUrl; } + /** + * Returns the absolute URL PATH of the current page + * @param $bForceHTTPS bool True to force HTTPS, false otherwise + * @return string The absolute URL to the current page + */ + static public function GetAbsoluteUrlPath($bForceHTTPS = false) + { + $sAbsoluteUrl = self::GetAbsoluteUrl(false, $bForceHTTPS); // False => Don't get the query string + $sAbsoluteUrl = substr($sAbsoluteUrl, 0, 1+strrpos($sAbsoluteUrl, '/')); // remove the current page, keep just the path, up to the last / + return $sAbsoluteUrl; + } + /** * Tells whether or not log off operation is supported. * Actually in only one case: diff --git a/core/dbobject.class.php b/core/dbobject.class.php index 555a10a14..c999ceb62 100644 --- a/core/dbobject.class.php +++ b/core/dbobject.class.php @@ -1130,8 +1130,9 @@ abstract class DBObject $aScalarArgs[$sArgName.'->id'] = $this->GetKey(); $aScalarArgs[$sArgName.'->object()'] = $this; $aScalarArgs[$sArgName.'->hyperlink()'] = $this->GetHyperlink(); - // #@# Prototype for a user portal - to be dehardcoded later - $aScalarArgs[$sArgName.'->hyperlink(portal)'] = '../portal/index.php?operation=details&id='.$this->GetKey(); + // #@# Prototype for a user portal - to be dehardcoded later + $sToPortal = utils::GetAbsoluteUrlPath().'portal/index.php?operation=details&id='.$this->GetKey(); + $aScalarArgs[$sArgName.'->hyperlink(portal)'] = ''.$this->GetName().''; $aScalarArgs[$sArgName.'->name()'] = $this->GetName(); $sClass = get_class($this); diff --git a/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml b/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml index 64e3c84ee..388f80e51 100644 --- a/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml +++ b/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml @@ -54,14 +54,13 @@ SELECT Person WHERE id=:this->caller_id -Ticket $this->name()$, priority $this->label(priority)$ - $this->ticket_status$ +Ticket $this->name()$, priority $this->label(priority)$ - $this->status$ <html> <body> -<p>The incident ticket $this->name()$ has changed to status $this->ticket_status$</p> -<p>Current situation: $this->current_situation$</p> +<p>The incident ticket $this->name()$ has changed to status $this->status$</p> <p>Last update: $this->last_update$</p> <hr/> -<p>for more information on this ticket, click here: $this->hyperlink()$</p> +<p>for more information on this ticket, click here: $this->hyperlink(portal)$</p> </body> </html> normal