[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2186-g5b0f099

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Sep 18 11:45:28 CEST 2017


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  5b0f099065f4e99f6eee874afa5ad24abb6579db (commit)
      from  eb5c286ceb43d368892304376bc03455cb16a74d (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=5b0f099065f4e99f6eee874afa5ad24abb6579db

commit 5b0f099065f4e99f6eee874afa5ad24abb6579db
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Sep 18 09:45:20 2017 +0000

    globalactivity plugin: fix show, fix other plugins integratin, support jquery datepicker

diff --git a/src/plugins/globalactivity/include/globalactivityPlugin.class.php b/src/plugins/globalactivity/include/globalactivityPlugin.class.php
index b83370f..2d9f345 100644
--- a/src/plugins/globalactivity/include/globalactivityPlugin.class.php
+++ b/src/plugins/globalactivity/include/globalactivityPlugin.class.php
@@ -81,7 +81,7 @@ class globalactivityPlugin extends Plugin {
 			$uri.'#globalactivity_getActivityForProject','rpc','encoded');
 	}
 
-	public function getData($begin,$end,$show,&$ids,&$texts,$gid = NULL) {
+	public function getData($begin,$end,&$show,&$ids,&$texts,$gid = NULL) {
 		if ($begin > $end) {
 			$tmp = $end;
 			$end = $begin;
@@ -241,7 +241,7 @@ class globalactivityPlugin extends Plugin {
 			}
 			$hookParams['group_id'] = $arr['group_id'];
 			$hookParams['results'] = &$results;
-			$hookParams['show'] = &$section;
+			$hookParams['show'] = &$show;
 			$hookParams['begin'] = $begin;
 			$hookParams['end'] = $end;
 			$hookParams['ids'] = &$ids;
@@ -250,7 +250,7 @@ class globalactivityPlugin extends Plugin {
 		}
 
 		if (count($show) < 1) {
-			$show = $section;
+			$show = $ids;
 		}
 
 		foreach ($show as $showthis) {
diff --git a/src/plugins/globalactivity/www/index.php b/src/plugins/globalactivity/www/index.php
index 9e3bec7..1e4323d 100644
--- a/src/plugins/globalactivity/www/index.php
+++ b/src/plugins/globalactivity/www/index.php
@@ -35,20 +35,10 @@ global $HTML;
 
 $received_begin = getStringFromRequest("start_date");
 $received_end = getStringFromRequest("end_date");
-$show = getArrayFromRequest('show', array('forumpost',
-					  'trackeropen',
-					  'trackerclose',
-					  'news',
-					  'taskopen',
-					  'taskclose',
-					  'taskdelete',
-					  'frsrelease',
-					  'docmannew',
-					  'docmanupdate',
-					  'docgroupnew'
-));
+$show = getArrayFromRequest('show');
 
 $date_format = _('%Y-%m-%d');
+$date_format_js = _('yy-mm-dd');
 
 if (!$received_begin || $received_begin == 0) {
 	$begin = (time() - (30 * 86400));
@@ -119,12 +109,12 @@ if (count($ids) < 1) {
 
 <div id="activity_startdate" >
 <div id="activity_label_startdate"><?php echo _('Start Date')._(':'); ?></div>
-<input name="start_date" value="<?php echo $rendered_begin; ?>" size="10" maxlength="10" />
+<input id="datepicker_start" name="start_date" value="<?php echo $rendered_begin; ?>" size="10" maxlength="10" />
 </div>
 
 <div id="activity_enddate" >
 <div id="activity_label_enddate"><?php echo _('End Date')._(':'); ?></div>
-<input name="end_date" value="<?php echo $rendered_end; ?>" size="10" maxlength="10" />
+<input id="datepicker_end" name="end_date" value="<?php echo $rendered_end; ?>" size="10" maxlength="10" />
 </div>
 
 <div id="activity_submit" >
@@ -188,4 +178,18 @@ if (count($ids) < 1) {
 	echo '</div>';
 }
 
+echo html_ao('script', array('type' => 'text/javascript'));
+?>
+//<![CDATA[
+
+jQuery('#datepicker_start').datepicker({
+  dateFormat: "<?php echo $date_format_js ?>"
+});
+jQuery('#datepicker_end').datepicker({
+  dateFormat: "<?php echo $date_format_js ?>"
+});
+
+//]]>
+<?php
+echo html_ac(html_ap() - 1);
 site_project_footer();

-----------------------------------------------------------------------

Summary of changes:
 .../include/globalactivityPlugin.class.php         |  6 ++--
 src/plugins/globalactivity/www/index.php           | 32 ++++++++++++----------
 2 files changed, 21 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list