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.0 has been updated
via e3a61c1aac79fe0ba9f812e740e2fbb77964a26a (commit)
from b8f6d1d35fad18b5f3f6aafb39801b1eb420c0bf (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=e3a61c1aac79fe0ba9f812e740e2fbb77964a26a
commit e3a61c1aac79fe0ba9f812e740e2fbb77964a26a
Author: Franck Villaume <[email protected]>
Date: Sat Nov 21 10:21:30 2015 +0100
fix FRS shownotes.php. use view=shownotes when needed
diff --git a/src/CHANGES b/src/CHANGES
index b2a808c..7550d74 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -4,6 +4,7 @@ FusionForge 6.0.4:
* Accounts: trigger system replication when user changes password or shell
(Inria)
* Accounts: passwords hashes: increase md5crypt salt length to 8; fix invalid
Blowfish salt (Inria)
* Accounts: passwords hashes: add support for SHA256/SHA512 (Inria)
+* FRS: fix shownotes.php link. Use new url form. view=shownotes (TrivialDev)
* MTA-Exim4: restart exim4 on install
* Plugin SCM: fix another race condition when creating project with SCM
selected (Inria)
* Plugin SCM Git: improve user matching when computing stats, support git
.mailmap (Inria)
diff --git a/src/plugins/admssw/common/RDFedFRSRelease.class.php
b/src/plugins/admssw/common/RDFedFRSRelease.class.php
index 8cd10f4..d4418b9 100644
--- a/src/plugins/admssw/common/RDFedFRSRelease.class.php
+++ b/src/plugins/admssw/common/RDFedFRSRelease.class.php
@@ -131,7 +131,7 @@ class RDFedFRSRelease extends FRSRelease {
rdfutils_setPropToUri($res, 'dcterms:publisher', $projecturi);
- rdfutils_setPropToUri($res, 'adms:relatedWebPage',
util_make_url ('/frs/shownotes.php?release_id='.$this->getID()) );
+ rdfutils_setPropToUri($res, 'adms:relatedWebPage',
util_make_url
('/frs/?view=shownotes&group_id='.$group->getID().'&release_id='.$this->getID())
);
rdfutils_setPropToUri($res, 'dcterms:isPartOf', util_make_url
('/projects#repo'));
diff --git a/src/www/export/rss20_newreleases.php
b/src/www/export/rss20_newreleases.php
index 64e0b13..bbbcc6e 100644
--- a/src/www/export/rss20_newreleases.php
+++ b/src/www/export/rss20_newreleases.php
@@ -109,7 +109,7 @@ while ($row = db_fetch_array($res)) {
print "
<link>http://".forge_get_config('web_host')."/project/showfiles.php?group_id=".$row['group_id']."&release_id=".$row['filerelease_id']."</link>\n";
print "
<description>".rss_description($row['module_notes'])."</description>\n";
print "
<author>".$row['user_name']."@".forge_get_config('users_host')."
(".$row['realname'].")</author>\n";
- print "
<comments>http://".forge_get_config('web_host')."/project/shownotes.php?group_id=".$row['group_id']."&release_id=".$row['filerelease_id']."</comments>\n";
+ print "
<comments>http://".forge_get_config('web_host')."/frs/?view=shownotes&group_id=".$row['group_id']."&release_id=".$row['filerelease_id']."</comments>\n";
print "
<pubDate>".rss_date($row['release_date'])."</pubDate>\n";
print "
<guid>http://".forge_get_config('web_host')."/project/showfiles.php?group_id=".$row['group_id']."&release_id=".$row['filerelease_id']."</guid>\n";
print " </item>\n";
diff --git a/src/www/new/index.php b/src/www/new/index.php
index 869e039..2ffca7c 100644
--- a/src/www/new/index.php
+++ b/src/www/new/index.php
@@ -120,7 +120,7 @@ if (!$res_new || db_numrows($res_new) < 1) {
util_make_link
('/frs/?group_id='.$row_new['group_id'].'&release_id='.$row_new['release_id'],_('Download')).
' ('._('Project Total:')
.$row_new['downloads'].') | ';
// notes for this release
- print util_make_link
('/frs/shownotes.php?release_id='.$row_new['release_id'],_('Notes and
Changes')).'
+ print util_make_link
('/frs/?view=shownotes&group_id='.$row_new['group_id'].'&release_id='.$row_new['release_id'],_('Notes
and Changes')).'
<hr />
</td>
</tr>';
diff --git a/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
index be25c55..b3502b9 100644
--- a/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
@@ -59,6 +59,7 @@ class FrsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
function getRows() {
$rowsCount = $this->searchQuery->getRowsCount();
$result =& $this->searchQuery->getResult();
+ $group_id = $this->searchQuery->groupId;
$return = '';
$rowColor = 0;
@@ -74,7 +75,7 @@ class FrsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
}
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($rowColor) .'>'
. '<td width="5%"> </td>'
- . '<td>'.util_make_link
('/frs/shownotes.php?release_id='.db_result($result, $i,
'release_id'),db_result($result, $i, 'release_name')).'</td>'
+ . '<td>'.util_make_link
('/frs/?view=shownotes&group_id='.$group_id.'&release_id='.db_result($result,
$i, 'release_id'),db_result($result, $i, 'release_name')).'</td>'
. '<td width="15%">'.db_result($result, $i,
'realname').'</td>'
. '<td
width="15%">'.relative_date(db_result($result,$i, 'release_date')).'</td></tr>';
$rowColor ++;
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/plugins/admssw/common/RDFedFRSRelease.class.php | 2 +-
src/www/export/rss20_newreleases.php | 2 +-
src/www/new/index.php | 2 +-
src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php | 3 ++-
5 files changed, 6 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
