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 0bb55ac29f79662d0484c908f1a7a125d66550b0 (commit)
via 798b4f301b0b22af079637001e27a2d747c6af59 (commit)
via d3380c0585e85c944e9799df756225b7dd842b5d (commit)
via 19ca9681288092334abd56d21be95f858e85a5b4 (commit)
via 225649064fa4c0c91758636f2fc96a4a6a1ef98d (commit)
via cfa6f8190de3f27876205a6f8034f841e270b062 (commit)
via 5fe2ab97a451686a0b4a10d30e4abfb3be1582d0 (commit)
via 785d44f6efa22ff9c7473d0bf9ef7818d05787ed (commit)
from 0ff89bd82f74b5cc8b47e183aaf59f18b7b37c47 (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=0bb55ac29f79662d0484c908f1a7a125d66550b0
commit 0bb55ac29f79662d0484c908f1a7a125d66550b0
Author: Franck Villaume <[email protected]>
Date: Thu May 25 17:42:48 2017 +0200
add missing dump information
diff --git a/src/common/docman/DocumentManager.class.php
b/src/common/docman/DocumentManager.class.php
index 94c8777..c65d264 100644
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@ -284,6 +284,7 @@ class DocumentManager extends FFError {
$settingsArr['use_webdav'] =
$this->Group->data_array['use_webdav'];
$settingsArr['use_docman_create_online'] =
$this->Group->data_array['use_docman_create_online'];
$settingsArr['use_docman_review'] =
forge_get_config('use_docman_review');
+ $settingsArr['group_id'] =
$this->Group->getID();
return $settingsArr;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=798b4f301b0b22af079637001e27a2d747c6af59
commit 798b4f301b0b22af079637001e27a2d747c6af59
Author: Franck Villaume <[email protected]>
Date: Thu May 25 17:42:33 2017 +0200
space
diff --git a/src/common/tracker/Artifact.class.php
b/src/common/tracker/Artifact.class.php
index 46b586d..5629a70 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -199,7 +199,7 @@ class Artifact extends FFObject {
* array('user' => 127,
'time' => 1234556789, 'nopermcheck' => true, 'nonotice' => true)
* @return bool id on success / false on failure.
*/
- function create($summary, $details, $assigned_to=100, $priority=3,
$extra_fields = array(), $importData = array()) {
+ function create($summary, $details, $assigned_to = 100, $priority = 3,
$extra_fields = array(), $importData = array()) {
//
// make sure this person has permission to add artifacts
//
@@ -1558,7 +1558,7 @@ class Artifact extends FFObject {
// Control that the id is
present in the db
$res = db_query_params ('SELECT
artifact_id FROM artifact WHERE artifact_id=$1',
- array($id));
+
array($id));
if (db_numrows($res) == 1) {
$new .= $id.' ';
} else {
@@ -1593,9 +1593,9 @@ class Artifact extends FFObject {
if ($extra_fields[$efid] === '') {
//nothing in field to update - text fields may
be blank
} else {
- $type=$ef[$efid]['field_type'];
+ $type = $ef[$efid]['field_type'];
//special treatment for DATETIME
- if ($type == ARTIFACT_EXTRAFIELDTYPE_DATETIME
&& $extra_fields[$efid]!='' ) {
+ if ($type == ARTIFACT_EXTRAFIELDTYPE_DATETIME
&& $extra_fields[$efid] != '' ) {
$dateTime =
DateTime::createFromFormat(_('Y-m-d H:i'), $extra_fields[$efid]);
$extra_fields[$efid] =
$dateTime->format('U');
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d3380c0585e85c944e9799df756225b7dd842b5d
commit d3380c0585e85c944e9799df756225b7dd842b5d
Author: Franck Villaume <[email protected]>
Date: Thu May 25 15:52:46 2017 +0200
fix docman notify users pop-up
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index 4ca788f..949a7f2 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -365,7 +365,7 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
}
$nextcell .=
util_make_link($redirecturl.'&action=monitorfile&option='.$option.'&fileid='.$d->getID(),
$image, array('title' => $titleMonitor));
}
- $nextcell .= util_make_link('#',
$HTML->getMailNotifyPic(_('Notify users'), 'notifyusers'), array('onclick' =>
'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', title:\''.addslashes($d->getName()).'\',
filename:\''.addslashes($d->getFileName()).'\',
description:'.json_encode($d->getDescription()).', isURL:\''.$d->isURL().'\',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Notify users')),
true);
+ $nextcell .= util_make_link('#',
$HTML->getMailNotifyPic(_('Notify users'), 'notifyusers'), array('onclick' =>
'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', title:\''.json_encode($d->getName(),
JSON_HEX_APOS).'\', filename:\''.addslashes($d->getFileName()).'\',
description:\''.json_encode($d->getDescription(), JSON_HEX_APOS).'\',
isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\',
isHtml:\''.$d->isHtml().'\', docManURL:\''.util_make_uri('/docman').'\'})',
'title' => _('Notify users')), true);
$cells[][] = $nextcell;
}
echo $HTML->multiTableRow(array(), $cells);
diff --git a/src/www/docman/scripts/DocManController.js
b/src/www/docman/scripts/DocManController.js
index 4d3f16f..e3f23b4 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -834,9 +834,10 @@ DocManListFileController.prototype =
toggleNotifyUserView: function(params) {
this.notifyparams = params;
- this.nofifyparams.nocache = new Date().getTime();
+ console.log(params);
+ var nocache = new Date().getTime();
jQuery('#notifytitle').text(this.notifyparams.title);
-
jQuery('#notifydescription').html(this.notifyparams.description);
+
jQuery('#notifydescription').text(this.notifyparams.description);
jQuery('#notifydocid').val(this.notifyparams.id);
jQuery('#notifyfilelink').text(this.notifyparams.filename);
if (this.notifyparams.statusId != 2) {
@@ -855,10 +856,10 @@ DocManListFileController.prototype =
type: 'dir',
itemid: this.notifyparams.docgroupId,
childgroup_id: this.notifyparams.childGroupId,
- rqd: this.nofifyparams.nocache
+ rqd: nocache
});
- this.lockInterval[this.notifyparams.id] =
setInterval("jQuery.get('" + this.notifyparams.docManURL + "/',
{group_id:"+this.notifyparams.groupId+",action:'lock',lock:1,type:'file',itemid:"+this.notifyparams.id+",childgroup_id:"+this.notifyparams.childGroupId+",
rqd:"+this.nofifyparams.nocache+"})", this.notifyparams.lockIntervalDelay);
- this.lockInterval[this.notifyparams.docgroupId] =
setInterval("jQuery.get('" + this.notifyparams.docManURL + "/',
{group_id:"+this.notifyparams.groupId+",action:'lock',lock:1,type:'dir',itemid:"+this.notifyparams.docgroupId+",childgroup_id:"+this.notifyparams.childGroupId+",
rqd:"+this.nofifyparams.nocache+"})", this.notifyparams.lockIntervalDelay);
+ this.lockInterval[this.notifyparams.id] =
setInterval("jQuery.get('" + this.notifyparams.docManURL + "/',
{group_id:"+this.notifyparams.groupId+",action:'lock',lock:1,type:'file',itemid:"+this.notifyparams.id+",childgroup_id:"+this.notifyparams.childGroupId+",
rqd:"+nocache+"})", this.notifyparams.lockIntervalDelay);
+ this.lockInterval[this.notifyparams.docgroupId] =
setInterval("jQuery.get('" + this.notifyparams.docManURL + "/',
{group_id:"+this.notifyparams.groupId+",action:'lock',lock:1,type:'dir',itemid:"+this.notifyparams.docgroupId+",childgroup_id:"+this.notifyparams.childGroupId+",
rqd:"+nocache+"})", this.notifyparams.lockIntervalDelay);
jQuery('#notify-userids').gentleSelect({columns: 2, itemWidth:
120});
jQuery(this.listfileparams.divNotifyUsers).dialog('option',
'title', '[D'+this.notifyparams.id+']
'+this.listfileparams.divNotifyTitle).dialog('open');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=19ca9681288092334abd56d21be95f858e85a5b4
commit 19ca9681288092334abd56d21be95f858e85a5b4
Author: Franck Villaume <[email protected]>
Date: Thu May 25 13:16:51 2017 +0200
fix wrong var
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 9c29393..352f3ff 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -440,7 +440,7 @@ class ArtifactTypeHtml extends ArtifactType {
$return .= $HTML->listTableTop($title_arr);
for ($i = 0; $i < $taskcount; $i++) {
- $taskinfo =
db_fetch_array_by_row($ah->relatedtasks, $i);
+ $taskinfo =
db_fetch_array_by_row($ah->getRelatedTasks(), $i);
$totalPercentage +=
$taskinfo['percent_complete'];
$taskid = $taskinfo['project_task_id'];
$projectid = $taskinfo['group_project_id'];
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=225649064fa4c0c91758636f2fc96a4a6a1ef98d
commit 225649064fa4c0c91758636f2fc96a4a6a1ef98d
Author: Franck Villaume <[email protected]>
Date: Thu May 25 13:14:11 2017 +0200
space + fix HTML
diff --git a/src/www/pm/mod_task.php b/src/www/pm/mod_task.php
index 26d265d..fce524c 100644
--- a/src/www/pm/mod_task.php
+++ b/src/www/pm/mod_task.php
@@ -266,10 +266,10 @@ if ($report->isError()) {
}
$report->setStartDate($pt->ProjectGroup->Group->getStartDate());
-echo $HTML->openForm(array('array' => '/reporting/timeadd.php', 'id' =>
'time-tracking', 'method' => 'post'));
+echo $HTML->openForm(array('action' => '/reporting/timeadd.php', 'id' =>
'time-tracking', 'method' => 'post'));
echo '<input type="hidden" name="project_task_id" value="'.$project_task_id.'"
/>
<input type="hidden" name="submit" value="1" />';
-echo $HTML->listTableTop ($title_arr);
+echo $HTML->listTableTop($title_arr);
echo '<tr>
<td class="align-center">'. report_weeks_box($report, 'week')
.'</td>
<td class="align-center">'. report_day_adjust_box() .'</td>
@@ -286,14 +286,14 @@ echo '<tr>
//
-$res=db_query_params ('SELECT users.realname, rep_time_tracking.report_date,
rep_time_tracking.hours, rep_time_category.category_name
+$res=db_query_params('SELECT users.realname, rep_time_tracking.report_date,
rep_time_tracking.hours, rep_time_category.category_name
FROM users,rep_time_tracking,rep_time_category
WHERE
users.user_id=rep_time_tracking.user_id
AND rep_time_tracking.time_code=rep_time_category.time_code
AND rep_time_tracking.project_task_id=$1',
array($project_task_id));
-$total_hours =0;
+$total_hours = 0;
for ($i=0; $i<db_numrows($res); $i++) {
echo '
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=cfa6f8190de3f27876205a6f8034f841e270b062
commit cfa6f8190de3f27876205a6f8034f841e270b062
Author: Franck Villaume <[email protected]>
Date: Thu May 25 13:07:09 2017 +0200
fix HTML syntax
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 69f8843..9c29393 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -127,44 +127,16 @@ class ArtifactTypeHtml extends ArtifactType {
global $HTML;
$this->header($params);
$group_id= $this->Group->getID();
-
- $links_arr[]='/tracker/admin/?group_id='.$group_id;
- $title_arr[]=_('New Tracker');
- $attr_arr[] = array('title'=>_('Create a new tracker.'));
-
-
$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&update_type=1';
- $title_arr[]=_('Update Settings');
- $attr_arr[] = array('title'=>_('Set up preferences like
expiration times, email addresses.'));
-
-
$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&effort_units=1';
- $title_arr[]=_('Manage Effort Units');
- $attr_arr[] = array('title'=>_('Manage Effort Units for Effort
custom extra field.'));
-
-
$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&add_extrafield=1';
- $title_arr[]=_('Manage Custom Fields');
- $attr_arr[] = array('title'=>_('Add new boxes like Phases,
Quality Metrics, Components, etc. Once added they can be used with other
selection boxes (for example, Categories or Groups) to describe and browse bugs
or other artifact types.'));
-
-
$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&workflow=1';
- $title_arr[]=_('Manage Workflow');
- $attr_arr[] = array('title'=>_('Edit tracker workflow.'));
-
-
$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&customize_list=1';
- $title_arr[]=_('Customize List');
- $attr_arr[] = array('title'=>_('Customize display for the
tracker.'));
-
-
$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&add_canned=1';
- $title_arr[]=_('Manage Canned Responses');
- $attr_arr[] = array('title'=>_('Create/change generic response
messages for the tracker.'));
-
-
$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&clone_tracker=1';
- $title_arr[]=_('Apply Template Tracker');
- $attr_arr[] = array('title'=>_('Duplicate parameters and fields
from a template trackers in this one.'));
-
-
$links_arr[]='/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&delete=1';
- $title_arr[]=_('Delete');
- $attr_arr[] = array('title'=>_('Permanently delete this
tracker.'));
-
- echo $HTML->printSubMenu($title_arr, $links_arr, $attr_arr);
+ $elementLi[] = array('content' =>
util_make_link('/tracker/admin/?group_id='.$group_id, _('New Tracker'),
array('title'=>_('Create a new tracker.'))));
+ $elementLi[] = array('content' =>
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&update_type=1',
_('Update Settings'), array('title'=>_('Set up preferences like expiration
times, email addresses.'))));
+ $elementLi[] = array('content' =>
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&effort_units=1',
_('Manage Effort Units'), array('title'=>_('Manage Effort Units for Effort
custom extra field.'))));
+ $elementLi[] = array('content' =>
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&add_extrafield=1',
_('Manage Custom Fields'), array('title'=>_('Add new boxes like Phases,
Quality Metrics, Components, etc. Once added they can be used with other
selection boxes (for example, Categories or Groups) to describe and browse bugs
or other artifact types.'))));
+ $elementLi[] = array('content' =>
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&workflow=1',
_('Manage Workflow'), array('title'=>_('Edit tracker workflow.'))));
+ $elementLi[] = array('content' =>
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&customize_list=1',
_('Customize List'), array('title'=>_('Customize display for the tracker.'))));
+ $elementLi[] = array('content' =>
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&add_canned=1',
_('Manage Canned Responses'), array('title'=>_('Create/change generic response
messages for the tracker.'))));
+ $elementLi[] = array('content' =>
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&clone_tracker=1',
_('Apply Template Tracker'), array('title'=>_('Duplicate parameters and fields
from a template trackers in this one.'))));
+ $elementLi[] = array('content' =>
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$this->getID().'&delete=1',
_('Delete'), array('title'=>_('Permanently delete this tracker.'))));
+ echo $HTML->html_list($elementLi);
}
function adminFooter($params) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5fe2ab97a451686a0b4a10d30e4abfb3be1582d0
commit 5fe2ab97a451686a0b4a10d30e4abfb3be1582d0
Author: Franck Villaume <[email protected]>
Date: Thu May 25 13:06:56 2017 +0200
use CSS
diff --git a/src/www/admin/userlist.php b/src/www/admin/userlist.php
index cb5754c..173dc28 100644
--- a/src/www/admin/userlist.php
+++ b/src/www/admin/userlist.php
@@ -124,32 +124,32 @@ function show_users_list($users, $filter = '', $sortorder
= 'realname', $start,
if ($u->getStatus() == 'P') {
$cells[] = array($nextcell, 'class' => 'pending');
}
- $cells[] = array(($u->getAddDate() ? date(_('Y-m-d H:i'),
$u->getAddDate()) : '-'), 'width' => '15%', 'class' => 'align-center');
+ $cells[] = array(($u->getAddDate() ? date(_('Y-m-d H:i'),
$u->getAddDate()) : '-'), 'style' => 'width:15%', 'class' => 'align-center');
if ($u->getStatus() != 'D') {
$nextcell =
util_make_link('/developer/?form_dev='.$u->getID(),_('User Profile'));
} else {
$nextcell = '<span class="strike">'._('User
Profile').'</span>';
}
- $cells[] = array($nextcell, 'width' => '15%', 'class' =>
'align-center');
+ $cells[] = array($nextcell, 'style' => 'width:15%', 'class' =>
'align-center');
if ($u->getStatus() != 'A') {
$nextcell =
util_make_link('/admin/userlist.php?action=activate&user_id='.$u->getID().$filter,_('Activate'));
} else {
$nextcell = '<span
class="strike">'._('Activate').'</span>';
}
- $cells[] = array($nextcell, 'width' => '15%', 'class' =>
'align-center');
+ $cells[] = array($nextcell, 'style' => 'width:15%', 'class' =>
'align-center');
if ($u->getStatus() != 'D') {
$nextcell =
util_make_link('/admin/userlist.php?action=delete&user_id='.$u->getID().$filter,_('Delete'));
} else {
$nextcell = '<span
class="strike">'._('Delete').'</span>';
}
- $cells[] = array($nextcell, 'width' => '15%', 'class' =>
'align-center');
+ $cells[] = array($nextcell, 'style' => 'width:15%', 'class' =>
'align-center');
if ($u->getStatus() != 'S') {
$nextcell =
util_make_link('/admin/userlist.php?action=suspend&user_id='.$u->getID().$filter,_('Suspend'));
} else {
$nextcell = '<span
class="strike">'._('Suspend').'</span>';
}
- $cells[] = array($nextcell, 'width' => '15%', 'class' =>
'align-center');
- $cells[] =
array(util_make_link('/admin/passedit.php?user_id='.$u->getID().$filter,_('Change
Password')), 'width' => '12%', 'class' => 'align-center');
+ $cells[] = array($nextcell, 'style' => 'width:15%', 'class' =>
'align-center');
+ $cells[] =
array(util_make_link('/admin/passedit.php?user_id='.$u->getID().$filter,_('Change
Password')), 'style' => 'width:12%', 'class' => 'align-center');
echo $HTML->multiTableRow(array(), $cells);
}
echo $HTML->listTableBottom();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=785d44f6efa22ff9c7473d0bf9ef7818d05787ed
commit 785d44f6efa22ff9c7473d0bf9ef7818d05787ed
Author: Franck Villaume <[email protected]>
Date: Thu May 25 12:43:14 2017 +0200
form cannot be child of span
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 45b5e3d..da8c2b0 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1292,7 +1292,7 @@ abstract class Layout extends FFError {
$html_content .= $this->closeForm();
}
}
- return html_e('span', $htmlAttr, $html_content, false);
+ return html_e('div', $htmlAttr, $html_content, false);
}
/**
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentManager.class.php | 1 +
src/common/docman/views/listfile.php | 2 +-
src/common/tracker/Artifact.class.php | 8 ++--
.../tracker/include/ArtifactTypeHtml.class.php | 50 +++++-----------------
src/www/admin/userlist.php | 12 +++---
src/www/docman/scripts/DocManController.js | 11 ++---
src/www/include/Layout.class.php | 2 +-
src/www/pm/mod_task.php | 8 ++--
8 files changed, 34 insertions(+), 60 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
