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 acb88aaacfb0957884e4ee65623bdf02765553e6 (commit)
via 58487af3256cbdc14c8fc9953d9d222f7c5363b3 (commit)
via 17b5a6b5176a18ffde12974353253d72e1b9bca0 (commit)
from 5acc24452a5be3847237e341c3142d138fda153d (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=acb88aaacfb0957884e4ee65623bdf02765553e6
commit acb88aaacfb0957884e4ee65623bdf02765553e6
Author: Franck Villaume <[email protected]>
Date: Fri Dec 8 17:25:44 2017 +0100
widget project public areas: display docman stat only if user has read
access
diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php
b/src/common/widget/Widget_ProjectPublicAreas.class.php
index dd1dc10..24df553 100644
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@ -124,8 +124,10 @@ class Widget_ProjectPublicAreas extends Widget {
$link_content = $HTML->getDocmanPic('') . ' ' .
_('Document Manager');
// <a rel="sioc:container_of"
xmlns:sioc="http://rdfs.org/sioc/ns#"; href="'.util_make_url
('/docman/?group_id='.$group_id).'">';
$result .=
util_make_link('/docman/?group_id='.$group_id, $link_content);
- $docm = new DocumentManager($project);
- $result .= ' ('.html_e('strong', array(),
$docm->getNbDocs(), true, false).' '._('documents').' '._('in').'
'.html_e('strong', array(), $docm->getNbFolders(), true, false).'
'._('directories').')';
+ if (forge_check_perm('docman', $group_id, 'read')) {
+ $docm = new DocumentManager($project);
+ $result .= ' ('.html_e('strong', array(),
$docm->getNbDocs(), true, false).' '._('documents').' '._('in').'
'.html_e('strong', array(), $docm->getNbFolders(), true, false).'
'._('directories').')';
+ }
$result .= '</div>';
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=58487af3256cbdc14c8fc9953d9d222f7c5363b3
commit 58487af3256cbdc14c8fc9953d9d222f7c5363b3
Author: Franck Villaume <[email protected]>
Date: Fri Dec 8 17:23:12 2017 +0100
artifact: set last_modified_date to open_date on creation. easy to use
later in widgets
diff --git a/src/common/tracker/Artifact.class.php
b/src/common/tracker/Artifact.class.php
index 739da00..e7ca90f 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -263,30 +263,31 @@ class Artifact extends FFObject {
}
db_begin();
- if (array_key_exists('time',$importData)){
+ if (array_key_exists('time', $importData)){
$time = $importData['time'];
} else {
$time = time();
}
$res = db_query_params('INSERT INTO artifact
- (group_artifact_id,status_id,priority,
-
submitted_by,assigned_to,open_date,summary,details)
- VALUES ($1,$2,$3,$4,$5,$6,$7,$8)',
+ (group_artifact_id, status_id, priority,
+ submitted_by, assigned_to, open_date,
last_modified_date, summary,details)
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8,
$9)',
array ($this->ArtifactType->getID(),
- $status_id,
- $priority,
- $user,
- $assigned_to,
- $time,
- htmlspecialchars($summary),
- htmlspecialchars($details)));
+ $status_id,
+ $priority,
+ $user,
+ $assigned_to,
+ $time,
+ $time,
+ htmlspecialchars($summary),
+ htmlspecialchars($details)));
if (!$res) {
$this->setError(db_error());
db_rollback();
return false;
}
- $artifact_id=db_insertid($res,'artifact','artifact_id');
+ $artifact_id = db_insertid($res, 'artifact', 'artifact_id');
if (!$res || !$artifact_id) {
$this->setError(db_error());
diff --git a/src/db/20171208-tracker-artifact-lastmodifieddate-init.sql
b/src/db/20171208-tracker-artifact-lastmodifieddate-init.sql
new file mode 100644
index 0000000..5f2e861
--- /dev/null
+++ b/src/db/20171208-tracker-artifact-lastmodifieddate-init.sql
@@ -0,0 +1,12 @@
+CREATE OR REPLACE FUNCTION SetArtifactLastModifiedDate() RETURNS int4 AS '
+DECLARE r RECORD;
+
+BEGIN
+ FOR r IN select artifact_id,open_date from artifact where
last_modified_date IS NULL LOOP
+ UPDATE artifact set last_modified_date = open_date where artifact_id =
r.artifact_id;
+ END LOOP;
+ return 1;
+END;
+' LANGUAGE plpgsql;
+
+SELECT SetArtifactLastModifiedDate() as output;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=17b5a6b5176a18ffde12974353253d72e1b9bca0
commit 17b5a6b5176a18ffde12974353253d72e1b9bca0
Author: Franck Villaume <[email protected]>
Date: Fri Dec 8 17:00:24 2017 +0100
fix even/odd in summary widget
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index ea6006e..9ffcf74 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -61,7 +61,7 @@ class ArtifactHtml extends Artifact {
} else {
$title_arr[] = _('Detailed description');
}
- $return .= $HTML->listTableTop($title_arr);
+ $return .= $HTML->listTableTop($title_arr, array(), 'full');
$return .= $HTML->multiTableRow(array('id' =>
'editdescription', 'style' => 'display:none'), array(array(html_e('textarea',
array_merge($editattrs, array('id' => 'tracker-description', 'required' =>
'required', 'name' => 'description', 'rows' => 20, 'style' => 'box-sizing:
box-border; width: 99%;', 'title' =>
util_html_secure(html_get_tooltip_description('description')))), $result),
'style' => 'display: block; box-sizing:border-box;')));
$return .= $HTML->multiTableRow(array('id' =>
'showdescription'), array(array($result_html)));
$return .= $HTML->listTableBottom();
diff --git a/src/common/widget/WidgetLayout_Row.class.php
b/src/common/widget/WidgetLayout_Row.class.php
index 14189a8..6456670 100644
--- a/src/common/widget/WidgetLayout_Row.class.php
+++ b/src/common/widget/WidgetLayout_Row.class.php
@@ -42,7 +42,7 @@ class WidgetLayout_Row {
function display($readonly, $owner_id, $owner_type) {
global $HTML;
- echo $HTML->listTableTop(array(), array(), '',
'mainwidget_table'.$this->id);
+ echo $HTML->listTableTop(array(), array(), 'full',
'mainwidget_table'.$this->id);
echo html_ao('tr', array('style' => 'vertical-align:top;'));
$last = count($this->columns) - 1;
$i = 0;
diff --git a/src/common/widget/Widget_TrackerSummary.class.php
b/src/common/widget/Widget_TrackerSummary.class.php
index f32b5ff..348da5e 100644
--- a/src/common/widget/Widget_TrackerSummary.class.php
+++ b/src/common/widget/Widget_TrackerSummary.class.php
@@ -99,7 +99,7 @@ class Widget_TrackerSummary extends Widget {
$return .= $ah->showDetails($editable, array('form' =>
'trackerform', 'class'=>$class));
} elseif ($func == 'add') {
$return .= notepad_func();
- $return .= $HTML->listTableTop();
+ $return .= $HTML->listTableTop(array(), array(),
'full');
$content = html_e('strong', array(), _('Detailed
description').$requiredInfo._(':'));
$content .=
notepad_button('document.forms.trackerform.details');
$content .= html_e('textarea', array('form' =>
'trackerform', 'id'=>'tracker-description', 'required'=>'required',
'name'=>'details', 'rows'=>'20', 'class'=>$class, 'style'=>'box-sizing:
border-box; width: 100%',
'title'=>util_html_secure(html_get_tooltip_description('description'))),
$details, false);
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/Artifact.class.php | 25 +++++++++++-----------
src/common/tracker/include/ArtifactHtml.class.php | 2 +-
src/common/widget/WidgetLayout_Row.class.php | 2 +-
.../widget/Widget_ProjectPublicAreas.class.php | 6 ++++--
src/common/widget/Widget_TrackerSummary.class.php | 2 +-
...1208-tracker-artifact-lastmodifieddate-init.sql | 12 +++++++++++
6 files changed, 32 insertions(+), 17 deletions(-)
create mode 100644 src/db/20171208-tracker-artifact-lastmodifieddate-init.sql
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
