composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 23:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

New placeholders in templates: this->html(attcode) and this->label(attcode)

Browse Source 
SVN:trunk[735]
This commit is contained in:
Romain Quetiez
2010-09-01 09:07:01 +00:00
parent 77159e8766
commit 4894dd2b4c
6 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/utils.inc.php
View File

@@ -39,6 +39,7 @@ class FileUploadException extends Exception
*/
class utils
{
private static $m_sConfigFile = ITOP_CONFIG_FILE;
private static $m_oConfig = null;
public static function ReadParam($sName, $defaultValue = "")
@@ -136,6 +137,15 @@ class utils
return file_get_contents($sFileName);
}
/**
* Specify the application config file
* @param string path to the config file
* @return void
*/
public static function SpecifyConfigFile($sFilePath)
{
self::$m_sConfigFile = $sFilePath;
}
/**
* Get access to the application config file
* @param none
@@ -145,7 +155,7 @@ class utils
{
if (self::$m_oConfig == null)
{
self::$m_oConfig = new Config(ITOP_CONFIG_FILE);
self::$m_oConfig = new Config(self::$m_sConfigFile);
}
return self::$m_oConfig;
}

9
core/dbobject.class.php
View File

@@ -1096,6 +1096,10 @@ abstract class DBObject
}
// Make standard context arguments
// Note: Needs to be reviewed because it is currently called once per attribute when an object is written (CheckToWrite / CheckValue)
// Several options here:
// 1) cache the result
// 2) set only the object ref and resolve the values iif needed from contextual templates and queries (easy for the queries, not for the templates)
public function ToArgs($sArgName = 'this')
{
$aScalarArgs = array();
@@ -1109,6 +1113,11 @@ abstract class DBObject
foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
{
$aScalarArgs[$sArgName.'->'.$sAttCode] = $this->Get($sAttCode);
if ($oAttDef->IsScalar())
{
$aScalarArgs[$sArgName.'->html('.$sAttCode.')'] = $this->GetAsHtml($sAttCode);
$aScalarArgs[$sArgName.'->label('.$sAttCode.')'] = strip_tags($this->GetAsHtml($sAttCode));
}
}
return $aScalarArgs;
}

6
modules/itop-tickets-1.0.0/data.struct.ta-actions.xml
View File

@@ -10,7 +10,7 @@
<to>SELECT Team WHERE id=:this-&gt;workgroup_id</to>
<cc></cc>
<bcc></bcc>
<subject>The ticket $this-&gt;name()$, priority $this-&gt;priority$ has been assigned to the workgroup $this-&gt;workgroup_name$</subject>
<subject>The ticket $this-&gt;name()$, priority $this-&gt;label(priority)$ has been assigned to the workgroup $this-&gt;workgroup_name$</subject>
<body>&lt;html&gt;
&lt;body&gt;
&lt;p&gt;The incident ticket $this-&gt;name()$ has been assigned to the workgroup $this-&gt;workgroup_name$.&lt;/p&gt;
@@ -32,7 +32,7 @@
<to>SELECT Person WHERE id=:this-&gt;agent_id</to>
<cc></cc>
<bcc></bcc>
<subject>The ticket $this-&gt;name()$, priority $this-&gt;priority$ has been assigned to you</subject>
<subject>The ticket $this-&gt;name()$, priority $this-&gt;label(priority)$ has been assigned to you</subject>
<body>&lt;html&gt;
&lt;body&gt;
&lt;p&gt;The incident ticket $this-&gt;name()$ has been assigned to you.&lt;/p&gt;
@@ -54,7 +54,7 @@
<to>SELECT Person WHERE id=:this-&gt;caller_id</to>
<cc></cc>
<bcc></bcc>
<subject>Ticket $this-&gt;name()$, priority $this-&gt;priority$ - $this-&gt;ticket_status$</subject>
<subject>Ticket $this-&gt;name()$, priority $this-&gt;label(priority)$ - $this-&gt;ticket_status$</subject>
<body>&lt;html&gt;
&lt;body&gt;
&lt;p&gt;The incident ticket $this-&gt;name()$ has changed to status $this-&gt;ticket_status$&lt;/p&gt;

4
modules/itop-tickets-1.0.0/data.struct.ta-triggers.xml
View File

@@ -8,12 +8,12 @@
<TriggerOnStateEnter id="5">
<description>Incident ticket assigned to agent</description>
<target_class>Incident</target_class>
<state>Assigned</state>
<state>assigned</state>
</TriggerOnStateEnter>
<TriggerOnStateEnter id="6">
<description>Incident ticket resolved</description>
<target_class>Incident</target_class>
<state>Resolved</state>
<state>resolved</state>
</TriggerOnStateEnter>
</Set>

2
setup/ajax.dataloader.php
View File

@@ -100,6 +100,8 @@ define('TMP_CONFIG_FILE', '../tmp-config-itop.php');
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Expires: Fri, 17 Jul 1970 05:00:00 GMT"); // Date in the past
Utils::SpecifyConfigFile(TMP_CONFIG_FILE);
/**
* Main program
*/

4
setup/index.php
View File

@@ -1082,6 +1082,8 @@ function SetupFinished(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $o
clearstatcache(); // Make sure we know what we are doing !
if (file_exists(FINAL_CONFIG_FILE))
{
Utils::SpecifyConfigFile(FINAL_CONFIG_FILE);
// The configuration file already exists
if (is_writable(FINAL_CONFIG_FILE))
{
@@ -1099,6 +1101,8 @@ if (file_exists(FINAL_CONFIG_FILE))
}
else
{
Utils::SpecifyConfigFile(TMP_CONFIG_FILE);
// No configuration file yet
// Check that the wizard can write into the root dir to create the configuration file
if (!is_writable(dirname(FINAL_CONFIG_FILE)))