This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 72baa3290954ad79fae1beba82ef044f42df90b3 (commit)
via 1e5da1a86d8925ecae7385df1c342ec7fef2ed28 (commit)
from 02b67cd6e6ff528bfc1a0cb0f63dcfc81e6650d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=72baa3290954ad79fae1beba82ef044f42df90b3
commit 72baa3290954ad79fae1beba82ef044f42df90b3
Author: Franck Villaume <[email protected]>
Date: Sun Dec 18 12:03:23 2016 +0100
support Status extrafield in dynamic simple browse
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 7aad1b5..300ffc3 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -363,6 +363,13 @@ if (db_numrows($res)>0) {
echo ' </div>
<div id="tabber-simplefiltering">';
$sort_fields = explode(',', $ath->getBrowseList());
+// Get the list of fields which can be sorted.
+$efarr = $ath->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_TEXT,
+ ARTIFACT_EXTRAFIELDTYPE_TEXTAREA,
+ ARTIFACT_EXTRAFIELDTYPE_INTEGER,
+ ARTIFACT_EXTRAFIELDTYPE_SELECT,
+ ARTIFACT_EXTRAFIELDTYPE_RADIO,
+ ARTIFACT_EXTRAFIELDTYPE_STATUS));
echo $HTML->openForm(array('action' =>
'/tracker/?group_id='.$group_id.'&atid='.$ath->getID(), 'method' => 'post'));
echo '
<input type="hidden" name="query_id" value="-1" />
@@ -391,21 +398,20 @@ foreach ($sort_fields as $sort_field) {
case '_votage':
case 'details':
case 'summary':
+ break;
//no ordering on these columns yet.
default:
+ if (intval($sort_field) > 0) {
+ if ($efarr[$sort_field]['field_type'] ==
ARTIFACT_EXTRAFIELDTYPE_STATUS) {
+ echo
'<td>'.$ath->getExtraFieldName($sort_field)._(':').'<br>'.$status_box.'</td>';
+ }
+ }
//build a box for extrafield ?
// no support yet.
break;
}
}
-// Compute the list of fields which can be sorted.
-$efarr = $ath->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_TEXT,
- ARTIFACT_EXTRAFIELDTYPE_TEXTAREA,
- ARTIFACT_EXTRAFIELDTYPE_INTEGER,
- ARTIFACT_EXTRAFIELDTYPE_SELECT,
- ARTIFACT_EXTRAFIELDTYPE_RADIO,
- ARTIFACT_EXTRAFIELDTYPE_STATUS));
$keys=array_keys($efarr);
for ($k=0; $k<count($keys); $k++) {
$i=$keys[$k];
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1e5da1a86d8925ecae7385df1c342ec7fef2ed28
commit 1e5da1a86d8925ecae7385df1c342ec7fef2ed28
Author: Franck Villaume <[email protected]>
Date: Sun Dec 18 11:20:51 2016 +0100
use function html_build_select_box_from_arrays
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 26a2368..7aad1b5 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -340,27 +340,17 @@ if (db_numrows($res)>0) {
echo '<input type="hidden" name="power_query" value="1" />';
echo $HTML->listTableTop().
'<tr><td>';
- echo '<select name="query_id" id="query_id">';
- echo '<option value="100">' . _('Select One') . '</option>';
- $current = '';
$selected = $af->getDefaultQuery();
+ $value_arr = array();
+ $text_arr = array();
+ $opt_group_arr = array();
while ($row = db_fetch_array($res)) {
- if ($current != $row['type']) {
- if ($current !== '')
- echo '</optgroup>';
- $label = $row['type'] ? _('Project') : _('Private');
- echo '<optgroup label="'.$label.'">';
- $current = $row['type'];
- }
- echo '<option value="'.$row['artifact_query_id'].'"';
- if ($row['artifact_query_id'] == $selected)
- echo ' selected="selected"';
- echo '>'. $row['query_name'] .'</option>'."\n";
+ $value_arr[] = $row['artifact_query_id'];
+ $text_arr[] = $row['query_name'];
+ $opt_group_arr[] = ($row['type'] ? _('Project') : _('Private'));
}
- if ($current !== '')
- echo '</optgroup>';
- echo '</select>
- <noscript><input type="submit" name="run" value="'._('Power Query').'"
/></noscript>
+ echo html_build_select_box_from_arrays($value_arr, $text_arr,
'query_id', $af->getDefaultQuery(), true, _('Select One'), false, '', false,
array('id' => 'query_id'), array(), array(), $opt_group_arr);
+ echo '<noscript><input type="submit" name="run" value="'._('Power
Query').'" /></noscript>
'.util_make_link('/tracker/?atid='.
$ath->getID().'&group_id='.$group_id.'&func=query', _('Build Query')).'
</td></tr>'.$HTML->listTableBottom();
echo $HTML->closeForm();
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/browse.php | 46 ++++++++++++++++-------------------
1 file changed, 21 insertions(+), 25 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
