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, 6.1 has been updated
via 8def9db4e37dd79999c6337f8f1d7c9c7c1d7cc6 (commit)
via cdc1e8eb552d939f0751bc019a4eff7f113318a7 (commit)
from 9b35e08264d4a9751cfa67ace6f41069039bf39b (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=8def9db4e37dd79999c6337f8f1d7c9c7c1d7cc6
commit 8def9db4e37dd79999c6337f8f1d7c9c7c1d7cc6
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat Jun 16 16:41:04 2018 +0200
docman: fix reporting, wrong index, less code
diff --git a/src/common/docman/views/reporting.php
b/src/common/docman/views/reporting.php
index a95f349..5c72b32 100644
--- a/src/common/docman/views/reporting.php
+++ b/src/common/docman/views/reporting.php
@@ -116,9 +116,9 @@ if ($report->isError()) {
echo 'ticks.push("'.$key.'");';
}
for ($i=0; $i < count($data); $i++) {
- $this_date = date(_('Y-m'), mktime(0, 0, 0,
substr($data[$i][2], 4, 2), 0, substr($data[$i][2], 0, 4)));
+ $this_date = substr($data[$i][2], 0,
4).'-'.substr($data[$i][2], 4, 2);
$index_key = array_search($this_date, $arr2);
- $valuesArr[$index_key+1]++;
+ $valuesArr[$index_key]++;
}
foreach ($valuesArr as $key) {
echo 'values.push('.$key.');';
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=cdc1e8eb552d939f0751bc019a4eff7f113318a7
commit cdc1e8eb552d939f0751bc019a4eff7f113318a7
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat Jun 16 16:29:24 2018 +0200
docman notification users pop-up: fix table css class
diff --git a/src/common/docman/views/notifyusers.php
b/src/common/docman/views/notifyusers.php
index 8370791..3fba491 100644
--- a/src/common/docman/views/notifyusers.php
+++ b/src/common/docman/views/notifyusers.php
@@ -43,7 +43,7 @@ foreach ($userObjects as $userObject) {
echo html_ao('div', array('id' => 'notifyUsers'));
echo $HTML->openForm(array('id' => 'notifyusersdoc', 'name' =>
'notifyusersdoc', 'method' => 'post', 'enctype' => 'multipart/form-data'));
-echo $HTML->listTableTop(array());
+echo $HTML->listTableTop(array(), array(), 'full');
$cells = array();
$cells[][] = _('Document Title')._(':');
$cells[][] = html_e('span', array('id' => 'notifytitle', 'type' => 'text',
'name' => 'title'), '', false);
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/notifyusers.php | 2 +-
src/common/docman/views/reporting.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
