Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1046620
D382.id932.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sat, Jun 28, 9:04 PM
Size
2 KB
Mime Type
text/x-diff
Expires
Sun, Jun 29, 9:04 PM (4 h, 15 m)
Engine
blob
Format
Raw Data
Handle
676635
Attached To
D382: INP-1784 - Adjust "grid_total_td" block to respect "format" parameter
D382.id932.diff
View Options
Index: core/admin_templates/incs/grid_blocks.tpl
===================================================================
--- core/admin_templates/incs/grid_blocks.tpl
+++ core/admin_templates/incs/grid_blocks.tpl
@@ -187,9 +187,9 @@
<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" as_label="$as_label" grid="$grid" no_special="$no_special" format="$format"/>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_total_td">
+<inp2:m_DefineElement name="grid_total_td" format="">
<inp2:m_if check="FieldTotal" field="$field" function_only="1">
- <inp2:FieldTotal field="$field"/>
+ <inp2:FieldTotal field="$field" format="$format"/>
<inp2:m_else/>
</inp2:m_if>
Index: core/kernel/db/db_tag_processor.php
===================================================================
--- core/kernel/db/db_tag_processor.php
+++ core/kernel/db/db_tag_processor.php
@@ -2488,7 +2488,13 @@
$list->setTotal($field, $total_function, $value);
}
- $value = $list->GetFormattedTotal($field, $total_function);
+ $format = array_key_exists('format', $params) ? $params['format'] : false;
+
+ if ( !$format || $format == '$format' ) {
+ $format = null;
+ }
+
+ $value = $list->GetFormattedTotal($field, $total_function, $format);
if (array_key_exists('currency', $params) && $params['currency']) {
$value = $this->AddCurrencySymbol($value, $iso);
Index: core/kernel/db/dblist.php
===================================================================
--- core/kernel/db/dblist.php
+++ core/kernel/db/dblist.php
@@ -660,12 +660,13 @@
/**
* Returns previously calculated total (formatted)
*
- * @param string $field
- * @param string $total_function
+ * @param string $field Field.
+ * @param string $total_function Total function.
+ * @param string $format Format.
+ *
* @return float
- * @access public
*/
- function GetFormattedTotal($field, $total_function)
+ public function GetFormattedTotal($field, $total_function, $format = null)
{
$res = $this->getTotal($field, $total_function);
$formatter_class = $this->GetFieldOption($field, 'formatter');
@@ -674,7 +675,7 @@
/** @var kFormatter $formatter */
$formatter = $this->Application->recallObject($formatter_class);
- $res = $formatter->Format($res, $field, $this);
+ $res = $formatter->Format($res, $field, $this, $format);
}
return $res;
Event Timeline
Log In to Comment