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 841ebaa2b2667aafed9843d167078b09318c1b9a (commit)
via ef15eef25d21ba9444b9bc0b260acfde9bbe896b (commit)
via 4317b58e4ef953bc25fd45bb9366cd6c3a7887d0 (commit)
via 3ada3e6245886abbf5a9ad5748d2e4bf0470a451 (commit)
via 8bf006d1c8baed0b10d9d817d8111979bb29edc4 (commit)
from 15b9bc27cade7d110d0241a70a57a1cf986b4fee (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=841ebaa2b2667aafed9843d167078b09318c1b9a
commit 841ebaa2b2667aafed9843d167078b09318c1b9a
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 15:05:50 2016 +0100
extend html_build_priority_select_box to support "any" + fix nice bug in
html_build_select_box_from_arrays with "any"
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 521b525..f4fd0d4 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -678,7 +678,7 @@ function html_build_select_box_from_arrays($vals, $texts,
$select_name,
//we don't always want the default Any row shown
if ($show_any) {
$opt_attrs = array('value' => '');
- if ($checked_val ='')
+ if ($checked_val == '')
$opt_attrs['selected'] = 'selected';
$return .= html_e('option', $opt_attrs,
util_html_secure($text_any), false);
$have_a_subelement = true;
@@ -1087,9 +1087,10 @@ function build_priority_select_box($name = 'priority',
$checked_val = '3', $noch
* @param string $checked_val The value to be checked
* @param bool $nochange Whether to make 'No Change'
selected.
* @param bool|array $attrs Array of other attributes for
this select element
+ * @param bool $show_any Display the 'Any' value
* @return string
*/
-function html_build_priority_select_box($name = 'priority', $checked_val =
'3', $nochange = false, $attrs = array()) {
+function html_build_priority_select_box($name = 'priority', $checked_val =
'3', $nochange = false, $attrs = array(), $show_any = false) {
if (empty($attrs['title'])) {
$attrs['title'] =
util_html_secure(html_get_tooltip_description($name));
} else {
@@ -1105,7 +1106,12 @@ function html_build_priority_select_box($name =
'priority', $checked_val = '3',
$show_100 = false;
$text_100 = '';
}
- return html_build_select_box_from_arrays($vals, $texts, $name,
$checked_val, $show_100, $text_100, false, '', false, $attrs);
+ if ($show_any) {
+ $any_text = _('Any');
+ } else {
+ $any_text = '';
+ }
+ return html_build_select_box_from_arrays($vals, $texts, $name,
$checked_val, $show_100, $text_100, $show_any, $any_text, false, $attrs);
}
/**
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ef15eef25d21ba9444b9bc0b260acfde9bbe896b
commit ef15eef25d21ba9444b9bc0b260acfde9bbe896b
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 13:40:13 2016 +0100
update php doc
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 8f1d45c..521b525 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -626,6 +626,7 @@ function html_use_jquerygentleselect() {
* @param array $attrs Array of other attributes for
this select element
* @param array $opts_attrs
* @param array $attrs_100
+ * @param array $optgroup
* @return string
* @throws Exception
*/
@@ -869,6 +870,7 @@ function html_build_multiple_select_box($result, $name,
$checked_array, $size =
* @param array $attrs Array of other attributes for this select element
* @param array $opts_attrs
* @param array $attrs_100
+ * @param array $optgroup
* @return string
* @throws Exception
*/
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4317b58e4ef953bc25fd45bb9366cd6c3a7887d0
commit 4317b58e4ef953bc25fd45bb9366cd6c3a7887d0
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 13:25:18 2016 +0100
use HTML helper
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 68288ee..9ce7a83 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -328,13 +328,11 @@ if ($af->query_type == 'custom') {
$javascript = 'jQuery(document).ready(function()
{jQuery("#tabber").tabs({active: 1});});';
echo html_e('script', array( 'type'=>'text/javascript'),
'//<![CDATA['."\n".$javascript."\n".'//]]>');
}
-echo '
-<div id="tabber" class="tabber">
- <ul>
- <li><a href="#tabber-advancedquery" title="'._('Use project queries or
build and use your own queries.').'">'._('Advanced queries').'</a></li>
- <li><a href="#tabber-simplefiltering" title="'._('Filtering by
assignee, state, priority.').'">'._('Simple Filtering and Sorting').'</a></li>
- </ul>
- <div id="tabber-advancedquery">';
+echo '<div id="tabber" class="tabber">';
+$elementLi[] = array('content' => util_make_link('#tabber-advancedquery',
_('Advanced queries'), array('title' => _('Use project queries or build and use
your own queries.')), true));
+$elementLi[] = array('content' => util_make_link('#tabber-simplefiltering',
_('Simple Filtering and Sorting'), array('title' => _('Filtering by assignee,
state, priority.')), true));
+echo $HTML->html_list($elementLi);
+echo '<div id="tabber-advancedquery">';
if (session_loggedin()) {
$res = db_query_params ('SELECT artifact_query_id,query_name, CASE WHEN
query_type>0 THEN 1 ELSE 0 END as type
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3ada3e6245886abbf5a9ad5748d2e4bf0470a451
commit 3ada3e6245886abbf5a9ad5748d2e4bf0470a451
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 13:24:54 2016 +0100
empty div when delete review
diff --git a/src/www/docman/scripts/DocManController.js
b/src/www/docman/scripts/DocManController.js
index 1bba43d..428c68d 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -648,6 +648,12 @@ DocManListFileController.prototype =
deleteVersion: function(params) {
this.delversion = params;
+ jQuery('#editfile-createreview').hide();
+ jQuery('#new_review').val(0);
+ jQuery('#review_id').val(0);
+ jQuery('#review_complete').val(0);
+ jQuery('#editfile-userstatusreview').empty();
+ jQuery('#editfile-completedreview').empty();
jQuery.getJSON(this.docparams.docManURL + '/?group_id=' +
this.docparams.groupId +
'&action=deleteversion&docid='+this.docparams.id+'&version='+this.delversion.version
, jQuery.proxy(function(data){
if (typeof data.html != 'undefined') {
jQuery('#editFile >
.feedback').remove();
@@ -672,6 +678,7 @@ DocManListFileController.prototype =
deleteReview: function(params) {
this.delreview = params;
+
jQuery.getJSON(this.docparams.docManURL + '/?group_id=' +
this.docparams.groupId +
'&action=deletereview&docid='+this.docparams.id+'&review='+this.delreview.review
, jQuery.proxy(function(data){
if (typeof data.html != 'undefined') {
jQuery('#editFile >
.feedback').remove();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8bf006d1c8baed0b10d9d817d8111979bb29edc4
commit 8bf006d1c8baed0b10d9d817d8111979bb29edc4
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 13:19:48 2016 +0100
less code
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 4329971..68288ee 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -324,15 +324,11 @@ print '<span rel="http://www.w3.org/2002/07/owl#sameAs";
resource="" ></span>'."\
print '<span rev="doap:bug-database sioc:space_of" resource="'. $proj_url .'"
></span>'."\n";
print "</div>\n"; // end of about
-echo '
-<script type="text/javascript">//<![CDATA[
-jQuery(document).ready(function() {';
if ($af->query_type == 'custom') {
- echo ' jQuery("#tabber").tabs({active: 1});';
+ $javascript = 'jQuery(document).ready(function()
{jQuery("#tabber").tabs({active: 1});});';
+ echo html_e('script', array( 'type'=>'text/javascript'),
'//<![CDATA['."\n".$javascript."\n".'//]]>');
}
echo '
-});
-//]]></script>
<div id="tabber" class="tabber">
<ul>
<li><a href="#tabber-advancedquery" title="'._('Use project queries or
build and use your own queries.').'">'._('Advanced queries').'</a></li>
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/browse.php | 20 +++++++-------------
src/www/docman/scripts/DocManController.js | 7 +++++++
src/www/include/html.php | 14 +++++++++++---
3 files changed, 25 insertions(+), 16 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
