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 ddcf8f30f6e2012c49ac9dd1913825507d643383 (commit)
via 89d26f2832a49f6d600786f479005ef04ad4f154 (commit)
via 2fe8b2cfeddefc56a47fd6b93955cd58ff7b8b6e (commit)
via e49b68c2e5eece9b26c3f6a7d9b4ffd5714f5f43 (commit)
via a47bb9519b7813e0732be64994177436833b7ba8 (commit)
via 342d3d8020c52099d33663b75cadb12c9fd8dfbf (commit)
via 5d90781b54aaa705db207dc2effca78b30446927 (commit)
via f5581712f921b615016cce4e6bfb7a6b0a5d776f (commit)
from 02f89f777b199ef58a6bc2ea2b2582b986d29cb0 (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=ddcf8f30f6e2012c49ac9dd1913825507d643383
commit ddcf8f30f6e2012c49ac9dd1913825507d643383
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 17:14:54 2016 +0100
add missing js var
diff --git a/src/common/docman/views/pendingfiles.php
b/src/common/docman/views/pendingfiles.php
index ec2bb6c..b304bf2 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -53,7 +53,9 @@ jQuery(document).ready(function() {
docManURL: '<?php echo util_make_uri('/docman')
?>',
lockIntervalDelay: 60000, //in microsecond and if you
change this value, please update the check value 600
divEditFile: jQuery('#editFile'),
- divEditTitle: '<?php echo _("Edit document dialog
box") ?>'
+ divEditTitle: '<?php echo _("Edit document dialog
box") ?>',
+ childGroupId: <?php echo util_ifsetor($childgroup_id,
0) ?>,
+ tableAddVersion: jQuery('#doc_version_edit')
});
});
//]]>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=89d26f2832a49f6d600786f479005ef04ad4f154
commit 89d26f2832a49f6d600786f479005ef04ad4f154
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 17:07:00 2016 +0100
fix sizing
diff --git a/src/common/docman/views/editfile.php
b/src/common/docman/views/editfile.php
index 9b69399..876a9d5 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -90,17 +90,17 @@ echo $HTML->listTableBottom();
echo html_e('button', array('id' => 'doc_version_addbutton', 'type' =>
'button', 'onclick' => 'javascript:controllerListFile.toggleAddVersionView()'),
_('Add new version'));
echo $HTML->listTableTop(array(), array(), 'listing full hide',
'doc_version_edit');
$cells = array();
-$cells[] = array(_('Document Title').utils_requiredField()._(':'), 'class' =>
'docman_editfile_title');
-$cells[][] = html_e('input', array('pattern' => '.{5,}', 'required' =>
'required', 'title' => sprintf(_('(at least %s characters)'), 5), 'id' =>
'title', 'type' => 'text', 'name' => 'title', 'size' => '40', 'maxlength' =>
'255'));
+$cells[] = array(_('Document Title').utils_requiredField()._(':'), 'class' =>
'docman_editfile_title', 'style' => 'width: 40%');
+$cells[][] = html_e('input', array('pattern' => '.{5,}', 'required' =>
'required', 'title' => sprintf(_('(at least %s characters)'), 5), 'id' =>
'title', 'type' => 'text', 'name' => 'title', 'maxlength' => '255', 'style' =>
'box-sizing: border-box; width: 100%'));
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[] = array(_('Description').utils_requiredField()._(':'), 'class' =>
'docman_editfile_description');
$cells[][] = html_e('textarea', array('pattern' => '.{10,}', 'required' =>
'required', 'title' => _('Editing tips:http,https or ftp: Hyperlinks. [#NNN]:
Tracker id NNN. [TNNN]: Task id NNN. [wiki:<pagename>]: Wiki page.
[forum:<msg_id>]: Forum post. [DNNN]: Document id NNN.').
-
sprintf(_('at least %s characters)'), 10), 'id' => 'description', 'name' =>
'description', 'maxlength' => '255', 'rows' => '5', 'cols' => '50'), '', false);
+
sprintf(_('at least %s characters)'), 10), 'id' => 'description', 'name' =>
'description', 'maxlength' => '255', 'rows' => '5', 'style' => 'box-sizing:
border-box; width: 100%'), '', false);
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[] = array(_('Comment')._(':'), 'class' => 'docman_editfile_comment');
-$cells[][] = html_e('textarea', array('id' => 'vcomment', 'name' =>
'vcomment', 'maxlength' => '255', 'rows' => '5', 'cols' => '50'), '', false);
+$cells[][] = html_e('textarea', array('id' => 'vcomment', 'name' =>
'vcomment', 'maxlength' => '255', 'rows' => '5', 'style' => 'box-sizing:
border-box; width: 100%'), '', false);
echo $HTML->multiTableRow(array(), $cells);
if ($g->useDocmanSearch()) {
$cells = array();
@@ -150,7 +150,7 @@ if ($g->useCreateOnline()) {
$cells = array();
$cells[] = array(_('Specify an new outside URL where the file will be
referenced').utils_requiredField()._(':'), 'class' => 'docman_editfile_title');
-$cells[][] = html_e('input', array('id' => 'editFileurl', 'type' => 'url',
'name' => 'file_url', 'size' => '50', 'pattern' => 'ftp://.+|https?://.+'));
+$cells[][] = html_e('input', array('id' => 'editFileurl', 'type' => 'url',
'name' => 'file_url', 'style' => 'box-sizing: border-box; width: 100%',
'pattern' => 'ftp://.+|https?://.+'));
echo $HTML->multiTableRow(array('id' => 'fileurlroweditfile', 'class' =>
'hide'), $cells);
$cells = array();
$cells[] = array(_('File')._(':'), 'class' => 'docman_editfile_file');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2fe8b2cfeddefc56a47fd6b93955cd58ff7b8b6e
commit 2fe8b2cfeddefc56a47fd6b93955cd58ff7b8b6e
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 16:51:24 2016 +0100
sync columns with listfile view
diff --git a/src/common/docman/views/pendingfiles.php
b/src/common/docman/views/pendingfiles.php
index 6f1e02a..ec2bb6c 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -62,8 +62,8 @@ jQuery(document).ready(function() {
if (isset($nested_pending_docs[$dirid]) &&
is_array($nested_pending_docs[$dirid])) {
echo html_ao('div', array('class' => 'docmanDiv'));
echo html_e('h4', array('class' => 'docman_h4'), _('Pending
files'), false);
- $tabletop = array(html_e('input', array('id' =>
'checkallpending', 'type' => 'checkbox', 'onClick' =>
'controllerListPending.checkAll("checkeddocidpending", "pending")')), '',
_('File Name'), _('Title'), _('Description'), _('Author'), _('Last time'),
_('Status'), _('Size'), _('Actions'));
- $classth = array('unsortable', 'unsortable', '', '', '', '',
'', '', '', 'unsortable');
+ $tabletop = array(html_e('input', array('id' =>
'checkallpending', 'type' => 'checkbox', 'onClick' =>
'controllerListPending.checkAll("checkeddocidpending", "pending")')), '', 'ID',
_('File Name'), _('Title'), _('Description'), _('Author'), _('Last time'),
_('Status'), _('Size'), _('View'), _('Actions'));
+ $classth = array('unsortable', 'unsortable', '', '', '', '',
'', '', '', '', '', 'unsortable');
echo $HTML->listTableTop($tabletop, array(),
'sortable_docman_listfile', 'sortable', $classth);
$time_new = 604800;
foreach ($nested_pending_docs[$dirid] as $d) {
@@ -78,6 +78,7 @@ jQuery(document).ready(function() {
$cells[][] =
util_make_link('/docman/view.php/'.$g->getID().'/'.$d->getID().'/'.urlencode($d->getFileName()),
html_image($d->getFileTypeImage(), 20, 20, array('alt'=>$d->getFileType())),
array('title' => _('View this document')));
}
}
+ $cells[][] = 'D'.$d->getID();
$nextcell = '';
if (($d->getUpdated() && $time_new > (time() -
$d->getUpdated())) || $time_new > (time() - $d->getCreated())) {
$nextcell.= $HTML->getNewPic(_('Created or
updated since less than 7 days'), 'new', array('class' =>
'docman-newdocument')).' ';
@@ -85,7 +86,7 @@ jQuery(document).ready(function() {
$cells[] = array($nextcell.$d->getFileName(), 'style'
=> 'word-wrap: break-word; max-width: 250px;');
$cells[] = array($d->getName(), 'style' => 'word-wrap:
break-word; max-width: 250px;');
$cells[] = array($d->getDescription(), 'style' =>
'word-wrap: break-word; max-width: 250px;');
- $cells[][] = make_user_link($d->getCreatorUserName(),
$d->getCreatorRealName());
+ $cells[][] =
util_display_user($d->getCreatorUserName(), $d->getCreatorID(),
$d->getCreatorRealName());
if ( $d->getUpdated() ) {
$cells[] = array(date(_('Y-m-d H:i'),
$d->getUpdated()), 'content' => $d->getUpdated());
} else {
@@ -102,6 +103,7 @@ jQuery(document).ready(function() {
break;
}
}
+ $cells[][] = $d->getDownload();
$editfileaction =
'/docman/?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
if ($childgroup_id) {
$editfileaction .=
'&childgroup_id='.$childgroup_id;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e49b68c2e5eece9b26c3f6a7d9b4ffd5714f5f43
commit e49b68c2e5eece9b26c3f6a7d9b4ffd5714f5f43
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 16:42:57 2016 +0100
use content to sort, fix wrong icon
diff --git a/src/common/docman/views/pendingfiles.php
b/src/common/docman/views/pendingfiles.php
index 5f3d652..6f1e02a 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -87,9 +87,9 @@ jQuery(document).ready(function() {
$cells[] = array($d->getDescription(), 'style' =>
'word-wrap: break-word; max-width: 250px;');
$cells[][] = make_user_link($d->getCreatorUserName(),
$d->getCreatorRealName());
if ( $d->getUpdated() ) {
- $cells[] = array(date(_('Y-m-d H:i'),
$d->getUpdated()), 'sorttable_customkey' => $d->getUpdated());
+ $cells[] = array(date(_('Y-m-d H:i'),
$d->getUpdated()), 'content' => $d->getUpdated());
} else {
- $cells[] = array(date(_('Y-m-d H:i'),
$d->getCreated()), 'sorttable_customkey' => $d->getCreated());
+ $cells[] = array(date(_('Y-m-d H:i'),
$d->getCreated()), 'content' => $d->getCreated());
}
$cells[][] =$d->getStateName();
switch ($d->getFileType()) {
@@ -107,7 +107,7 @@ jQuery(document).ready(function() {
$editfileaction .=
'&childgroup_id='.$childgroup_id;
}
$editfileaction .= '&group_id='.$group_id;
- $cells[][] = util_make_link('#',
html_image('docman/edit-file.png', 22, 22, array('alt' => _('Edit this
document'))), array('onclick' =>
'javascript:controllerListPending.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).'
,id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
title:\''.addslashes($d->getName()).'\',
filename:\''.addslashes($d->getFileName()).'\',
description:\''.addslashes($d->getDescription()).'\',
isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\',
useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this
document')), true).
+ $cells[][] = util_make_link('#',
$HTML->getEditFilePic($edittitle, 'editdocument'), array('onclick' =>
'javascript:controllerListPending.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).'
,id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
title:\''.addslashes($d->getName()).'\',
filename:\''.addslashes($d->getFileName()).'\',
description:\''.addslashes($d->getDescription()).'\',
isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\',
useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this
document')), true).
util_make_link('#',
html_image('docman/validate.png', 22, 22, array('alt' => _('Activate in this
folder'))), array('onclick' =>
'window.location.href=\''.util_make_uri($redirecturl.'&action=validatefile&fileid='.$d->getID()).'\'',
'title' => _('Activate in this folder')), true);
echo $HTML->multiTableRow(array(), $cells);
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a47bb9519b7813e0732be64994177436833b7ba8
commit a47bb9519b7813e0732be64994177436833b7ba8
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 16:42:32 2016 +0100
fix display pending files
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index 9139dd2..e9a144a 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -133,7 +133,7 @@ if (is_array($d_arr) && count($d_arr) > 0) {
}
$df->setStateID(array(3));
-$d_pending_arr = $df->getDocuments();
+$d_pending_arr = $df->getDocuments(1);
if (is_array($d_pending_arr) && count($d_pending_arr) > 0) {
// Get the document groups info
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=342d3d8020c52099d33663b75cadb12c9fd8dfbf
commit 342d3d8020c52099d33663b75cadb12c9fd8dfbf
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 16:14:06 2016 +0100
move code to the right place :-/
diff --git a/src/www/docman/scripts/DocManController.js
b/src/www/docman/scripts/DocManController.js
index 428c68d..c9ca524 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -648,12 +648,6 @@ DocManListFileController.prototype =
deleteVersion: function(params) {
this.delversion = params;
- jQuery('#editfile-createreview').hide();
- jQuery('#new_review').val(0);
- jQuery('#review_id').val(0);
- jQuery('#review_complete').val(0);
- jQuery('#editfile-userstatusreview').empty();
- jQuery('#editfile-completedreview').empty();
jQuery.getJSON(this.docparams.docManURL + '/?group_id=' +
this.docparams.groupId +
'&action=deleteversion&docid='+this.docparams.id+'&version='+this.delversion.version
, jQuery.proxy(function(data){
if (typeof data.html != 'undefined') {
jQuery('#editFile >
.feedback').remove();
@@ -678,7 +672,12 @@ DocManListFileController.prototype =
deleteReview: function(params) {
this.delreview = params;
-
+ jQuery('#editfile-createreview').hide();
+ jQuery('#new_review').val(0);
+ jQuery('#review_id').val(0);
+ jQuery('#review_complete').val(0);
+ jQuery('#editfile-userstatusreview').empty();
+ jQuery('#editfile-completedreview').empty();
jQuery.getJSON(this.docparams.docManURL + '/?group_id=' +
this.docparams.groupId +
'&action=deletereview&docid='+this.docparams.id+'&review='+this.delreview.review
, jQuery.proxy(function(data){
if (typeof data.html != 'undefined') {
jQuery('#editFile >
.feedback').remove();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5d90781b54aaa705db207dc2effca78b30446927
commit 5d90781b54aaa705db207dc2effca78b30446927
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 16:09:23 2016 +0100
fix typo & php syntax part 2
diff --git a/src/common/docman/actions/getdocreviewuserstatus.php
b/src/common/docman/actions/getdocreviewuserstatus.php
index 3b382da..0c462a9 100644
--- a/src/common/docman/actions/getdocreviewuserstatus.php
+++ b/src/common/docman/actions/getdocreviewuserstatus.php
@@ -50,7 +50,7 @@ if ($docid && $revid) {
$result['html'] = $HTML->warning_msg(_('Cannot retrieve
document')._(': ').$docid);
}
} else {
- $result['html'] = $HTML->warning_msg(_('No document ID or no review id.
Cannot retrieve information.').$docid.$revid);
+ $result['html'] = $HTML->warning_msg(_('No document ID or no review id.
Cannot retrieve information.'));
}
echo json_encode($result);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f5581712f921b615016cce4e6bfb7a6b0a5d776f
commit f5581712f921b615016cce4e6bfb7a6b0a5d776f
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 16:09:01 2016 +0100
fix typo & php syntax
diff --git a/src/common/docman/actions/getdocreviewcompleteform.php
b/src/common/docman/actions/getdocreviewcompleteform.php
index 492722c..e058693 100644
--- a/src/common/docman/actions/getdocreviewcompleteform.php
+++ b/src/common/docman/actions/getdocreviewcompleteform.php
@@ -37,7 +37,7 @@ if (!forge_check_perm('docman', $group_id, 'approve')) {
$docid = getIntFromRequest('docid');
$revid = getIntFromRequest('revid');
-if ($docid & $revid) {
+if ($docid && $revid) {
$documentObject = document_get_object($docid, $group_id);
if ($documentObject && !$documentObject->isError()) {
$dr = new DocumentReview($documentObject, $revid);
@@ -50,7 +50,7 @@ if ($docid & $revid) {
$result['html'] = $HTML->warning_msg(_('Cannot retrieve
document')._(': ').$docid);
}
} else {
- $result['html'] = $HTML->warning_msg(_('No document ID or no review id.
Cannot retrieve inforamtion.'));
+ $result['html'] = $HTML->warning_msg(_('No document ID or no review id.
Cannot retrieve information.'));
}
echo json_encode($result);
diff --git a/src/common/docman/actions/getdocreviewuserstatus.php
b/src/common/docman/actions/getdocreviewuserstatus.php
index c3483aa..3b382da 100644
--- a/src/common/docman/actions/getdocreviewuserstatus.php
+++ b/src/common/docman/actions/getdocreviewuserstatus.php
@@ -37,7 +37,7 @@ if (!forge_check_perm('docman', $group_id, 'approve')) {
$docid = getIntFromRequest('docid');
$revid = getIntFromRequest('revid');
-if ($docid & $revid) {
+if ($docid && $revid) {
$documentObject = document_get_object($docid, $group_id);
if ($documentObject && !$documentObject->isError()) {
$dr = new DocumentReview($documentObject, $revid);
@@ -50,7 +50,7 @@ if ($docid & $revid) {
$result['html'] = $HTML->warning_msg(_('Cannot retrieve
document')._(': ').$docid);
}
} else {
- $result['html'] = $HTML->warning_msg(_('No document ID or no review id.
Cannot retrieve inforamtion.'));
+ $result['html'] = $HTML->warning_msg(_('No document ID or no review id.
Cannot retrieve information.').$docid.$revid);
}
echo json_encode($result);
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/actions/getdocreviewcompleteform.php | 4 ++--
src/common/docman/actions/getdocreviewuserstatus.php | 4 ++--
src/common/docman/views/editfile.php | 10 +++++-----
src/common/docman/views/listfile.php | 2 +-
src/common/docman/views/pendingfiles.php | 18 +++++++++++-------
src/www/docman/scripts/DocManController.js | 13 ++++++-------
6 files changed, 27 insertions(+), 24 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
