[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8495]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8495] |
|
Date: |
Thu, 05 Jan 2012 14:17:29 +0000 |
Revision: 8495
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8495
Author: vator
Date: 2012-01-05 14:17:28 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/templates/base/view_control_info.xsl
Added Paths:
-----------
trunk/controller/templates/base/control_item/sort_control_items.xsl
Removed Paths:
-------------
trunk/controller/templates/base/control_item/view_control_items.xsl
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2012-01-05 10:00:26 UTC
(rev 8494)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2012-01-05 14:17:28 UTC
(rev 8495)
@@ -308,7 +308,7 @@
return $results;
}
- function get_control_items_by_control_id($control_id)
+ function get_control_items_by_control_id($control_id,
$returnType = "object")
{
$results = array();
@@ -325,8 +325,10 @@
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
- $results[] = $control_item;
+ if($returnType == "array")
+ $results[] = $control_item->toArray();
}
+
return $results;
}
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-05 10:00:26 UTC
(rev 8494)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-05 14:17:28 UTC
(rev 8495)
@@ -267,14 +267,35 @@
$control = $this->so_control->get_single($control_id);
- $control_items_array =
$this->so_control_item->get_control_items_by_control_id($control_id);
+ $control_items_array =
$this->so_control_item->get_control_items_by_control_id($control_id, "array");
$data = array
(
'control_items_array' => $control_items_array
);
-
self::render_template_xsl('control_item/view_control_items', $data);
+ $xslttemplate = CreateObject('phpgwapi.xslttemplates');
+
+ $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/control_item/sort_control_items'));
+
+ $xslttemplate->set_var('phpgw',array('view_control_items' =>
$data));
+
+ $xslttemplate->xsl_parse();
+ $xslttemplate->xml_parse();
+
+ $xml = new DOMDocument;
+ $xml->loadXML($xslttemplate->xmldata);
+
+ $xsl = new DOMDocument;
+ $xsl->loadXML($xslttemplate->xsldata);
+
+ // Configure the transformer
+ $proc = new XSLTProcessor;
+ $proc->importStyleSheet($xsl); // attach the xsl rules
+
+ $html = $proc->transformToXML($xml);
+
+ echo $html;
}
public function view_check_lists_for_control()
Copied: trunk/controller/templates/base/control_item/sort_control_items.xsl
(from rev 8492,
trunk/controller/templates/base/control_item/view_control_items.xsl)
===================================================================
--- trunk/controller/templates/base/control_item/sort_control_items.xsl
(rev 0)
+++ trunk/controller/templates/base/control_item/sort_control_items.xsl
2012-01-05 14:17:28 UTC (rev 8495)
@@ -0,0 +1,18 @@
+<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
+
+<xsl:template match="sort_control_items">
+
+<div>
+ <ul class="control_items">
+ <xsl:for-each select="control_items_array">
+ <li>
+ <h4><xsl:value-of select="title"/></h4>
+ </li>
+ </xsl:for-each>
+ </ul>
+
+ <div>
+ <input class="btn" type="submit" name="save_control_items"
value="Print" />
+ </div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/control_item/sort_control_items.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/controller/templates/base/control_item/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_item/view_control_items.xsl
2012-01-05 10:00:26 UTC (rev 8494)
+++ trunk/controller/templates/base/control_item/view_control_items.xsl
2012-01-05 14:17:28 UTC (rev 8495)
@@ -1,16 +0,0 @@
-<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-<xsl:template name="view_control_items" xmlns:php="http://php.net/xsl";>
-<div>
- <ul class="control_items">
- <xsl:for-each select="control_items_array">
- <li>
- <h4><xsl:value-of
select="control_item/title"/></h4>
- </li>
- </xsl:for-each>
- </ul>
-
- <div>
- <input class="btn" type="submit" name="save_control_items"
value="Print" title = "{$lang_save}" />
- </div>
-</div>
-</xsl:template>
Modified: trunk/controller/templates/base/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/view_control_info.xsl 2012-01-05
10:00:26 UTC (rev 8494)
+++ trunk/controller/templates/base/view_control_info.xsl 2012-01-05
14:17:28 UTC (rev 8495)
@@ -49,7 +49,7 @@
type: 'POST',
url: requestUrl,
success: function(data) {
- $("#tab_content").replaceWith(data);
+ $("#tab_content").html(data);
}
});
@@ -89,7 +89,6 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
-
</xsl:attribute>
Kontrollpunkter
</a>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8495],
Torstein <=