[Fusionforge-commits] FusionForge branch master updated. 6.0.4-724-g0b63776
Franck Villaume
nerville at libremir.placard.fr.eu.org
Fri Jul 15 17:24:36 CEST 2016
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 0b63776c5c5b422c4bd3be47ce17c791cc6c8a92 (commit)
via 4f7035bec96166408fb7fb48d4fdfa9289b1f423 (commit)
from 480e62b1c632ad601b0255487b48e239e2799bc9 (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=0b63776c5c5b422c4bd3be47ce17c791cc6c8a92
commit 0b63776c5c5b422c4bd3be47ce17c791cc6c8a92
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Fri Jul 15 17:24:06 2016 +0200
docman: fix order of version of a document
diff --git a/src/common/docman/DocumentVersionFactory.class.php b/src/common/docman/DocumentVersionFactory.class.php
index e2fb636..36dcfad 100644
--- a/src/common/docman/DocumentVersionFactory.class.php
+++ b/src/common/docman/DocumentVersionFactory.class.php
@@ -61,7 +61,7 @@ class DocumentVersionFactory extends FFError {
global $HTML;
$versions = array();
// everything but data_words! Too much memory consumption.
- $res = db_query_params('SELECT serial_id, version, docid, current_version, title, updatedate, createdate, created_by, description, filename, filetype, filesize, vcomment FROM doc_data_version WHERE docid = $1 ORDER by version ASC',
+ $res = db_query_params('SELECT serial_id, \'_\'||version as version, docid, current_version, title, updatedate, createdate, created_by, description, filename, filetype, filesize, vcomment FROM doc_data_version WHERE docid = $1 ORDER by version DESC',
array($this->Document->getID()), $limit, $start);
if ($res) {
$numrows = db_numrows($res);
diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index 95dd37e..94847c3 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -105,7 +105,7 @@ DocManListFileController.prototype =
var modalId = this.listfileparams.divEditFile;
jQuery(modalId).dialog({
autoOpen: false,
- width: 800,
+ width: 900,
modal: true,
title: this.listfileparams.divEditTitle,
buttons: {
@@ -431,7 +431,7 @@ DocManListFileController.prototype =
for (var i = 0; i < versionActionsArrayLength; i++) {
versionactiontdcontent += val.versionactions[i];
}
- var htmlString = '<tr id="docversion'+val.version+'" ><td>'+val.version+currenttdcontent+'</td><td>'+filenametdcontent[0].outerHTML+'</td><td>'+val.title+'</td><td>'+val.description+'</td><td>'+val.vcomment+'</td><td>'+val.created_by_username+'</td><td>'+val.lastdate+'</td><td>'+val.filesize_readable+'</td><td>'+versionactiontdcontent+'</td></tr>'
+ var htmlString = '<tr id="docversion'+val.version.substr(1)+'" ><td>'+val.version.substr(1)+currenttdcontent+'</td><td>'+filenametdcontent[0].outerHTML+'</td><td>'+val.title+'</td><td>'+val.description+'</td><td>'+val.vcomment+'</td><td>'+val.created_by_username+'</td><td>'+val.lastdate+'</td><td>'+val.filesize_readable+'</td><td>'+versionactiontdcontent+'</td></tr>'
jQuery('#sortable_doc_version_table > tbody:last-child').append(htmlString);
});
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4f7035bec96166408fb7fb48d4fdfa9289b1f423
commit 4f7035bec96166408fb7fb48d4fdfa9289b1f423
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Fri Jul 15 16:55:28 2016 +0200
frs: reorg actions on admin
diff --git a/src/common/frs/views/admin.php b/src/common/frs/views/admin.php
index d35885b..e42762d 100644
--- a/src/common/frs/views/admin.php
+++ b/src/common/frs/views/admin.php
@@ -87,15 +87,15 @@ if (count($FRSPackages) == 0) {
$title_arr[] = html_e('input', array('id' => 'checkallactive', 'type' => 'checkbox', 'title' => _('Select / Deselect all packages for massaction'), 'onClick' => 'controllerFRS.checkAll("checkedrelidactive", "active")'));
$thTitleArray[] = NULL;
}
- $title_arr[] = _('Releases');
- $thTitleArray[] = NULL;
$title_arr[] = _('Package name');
$thTitleArray[] = NULL;
$title_arr[] = _('Status');
$thTitleArray[] = NULL;
$title_arr[] = _('Publicly Viewable');
$thTitleArray[] = _('To change public visibility of a specific package, you have to use the role permission.');
- $title_arr[] = _('Actions');
+ $title_arr[] = _('Actions on package');
+ $thTitleArray[] = NULL;
+ $title_arr[] = _('Actions on release');
$thTitleArray[] = NULL;
@@ -107,14 +107,6 @@ if (count($FRSPackages) == 0) {
} else {
$cells[][] = '';
}
- $content = '';
- if (forge_check_perm('frs', $FRSPackage->getID(), 'release')) {
- $content = util_make_link('/frs/?view=qrs&package_id='.$FRSPackage->getID().'&group_id='.$group_id, '<strong>['._('Add Release').']</strong>');
- }
- if (forge_check_perm('frs', $FRSPackage->getID(), 'file') && count($FRSPackage->getReleases())) {
- $content .= util_make_link('/frs/?view=showreleases&package_id='.$FRSPackage->getID().'&group_id='.$group_id, $HTML->getConfigurePic(_('Edit Releases'), _('Edit Releases')));
- }
- $cells[] = array($content, 'style' => 'white-space: nowrap;', 'align' => 'center');
$package_nameInputAttr = array('type' => 'text', 'name' => 'package_name', 'value' => html_entity_decode($FRSPackage->getName()), 'size' => 20, 'maxlength' => 60, 'required' => 'required', 'pattern' => '.{3,}', 'title' => _('At least 3 characters'));
if (!forge_check_perm('frs', $FRSPackage->getID(), 'admin')) {
$package_nameInputAttr['disabled'] = 'disabled';
@@ -131,6 +123,14 @@ if (count($FRSPackages) == 0) {
$cells[][] = $FRSPackage->getPublicLabel();
$cells[][] = '';
}
+ $content = '';
+ if (forge_check_perm('frs', $FRSPackage->getID(), 'release')) {
+ $content .= util_make_link('/frs/?view=qrs&package_id='.$FRSPackage->getID().'&group_id='.$group_id, '<strong>['._('Add Release').']</strong>');
+ }
+ if (forge_check_perm('frs', $FRSPackage->getID(), 'file') && count($FRSPackage->getReleases())) {
+ $content .= util_make_link('/frs/?view=showreleases&package_id='.$FRSPackage->getID().'&group_id='.$group_id, $HTML->getConfigurePic(_('Edit Releases'), _('Edit Releases')));
+ }
+ $cells[] = array($content, 'style' => 'white-space: nowrap;', 'align' => 'center');
echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($key, true), 'id' => 'pkgid'.$FRSPackage->getID()), $cells);
}
echo $HTML->listTableBottom();
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentVersionFactory.class.php | 2 +-
src/common/frs/views/admin.php | 22 +++++++++++-----------
src/www/docman/scripts/DocManController.js | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list