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 b33e07147b4785ff316d3a900e637adcdde1380a (commit)
via 58b84c5bd87fcfda1721c93cd91cd4c16537678b (commit)
from 8f0ee5bb983cfc3bdb6fa5aa0cf2e3b122f5f322 (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=b33e07147b4785ff316d3a900e637adcdde1380a
commit b33e07147b4785ff316d3a900e637adcdde1380a
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 17:48:23 2016 +0100
extend doc test: move to pending status
diff --git a/tests/func/20_Docs/createDocURLTest.php
b/tests/func/20_Docs/createDocURLTest.php
index 0eb927b..027c8bf 100644
--- a/tests/func/20_Docs/createDocURLTest.php
+++ b/tests/func/20_Docs/createDocURLTest.php
@@ -111,7 +111,7 @@ class CreateDocURL extends FForge_SeleniumTestCase {
$this->assertTextPresent("Document already published in this
folder");
}
- function testDisplayVersionDoc() {
+ function testMoveVersionDocToPending() {
$this->loadAndCacheFixture();
$this->switchUser(FORGE_ADMIN_USERNAME);
@@ -132,5 +132,9 @@ class CreateDocURL extends FForge_SeleniumTestCase {
$this->click("css=img[alt='editdocument']");
$this->pause("10000");
$this->assertTextPresent("1 (x)");
+ $this->select('id=pending');
+ $this->clickAndWait("xpath=(//button[@type='button'])[4]");
+ $this->assertTextPresent("Pending files");
+ $this->assertTextPresent("terms.php");
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=58b84c5bd87fcfda1721c93cd91cd4c16537678b
commit 58b84c5bd87fcfda1721c93cd91cd4c16537678b
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 17:46:36 2016 +0100
make the var available for pendingfiles.php if no valid documents
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index e9a144a..49f00d2 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -238,6 +238,15 @@ if ($DocGroupName) {
}
}
+// to be used by pendingfiles.php
+$edittitle = _('Edit this document, add version');
+if (forge_get_config('use_object_associations')) {
+ $edittitle .= ', '._('associate to other objects');
+}
+if (forge_get_config('use_docman_review')) {
+ $edittitle .= ', '._('create or comment a review');
+}
+
if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
$tabletop = array(html_e('input', array('id' => 'checkallactive',
'type' => 'checkbox', 'title' => _('Select / Deselect all documents for
massaction'), 'onClick' => 'controllerListFile.checkAll("checkeddocidactive",
"active")')), '', 'ID', _('File Name'), _('Title'), _('Description'),
_('Author'), _('Last time'), _('Status'), _('Size'), _('View'));
$classth = array('unsortable', 'unsortable', '', '', '', '', '', '',
'', '', '');
@@ -322,13 +331,6 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
}
$editfileaction .= '&group_id='.$group_id;
$notifyaction .= '&group_id='.$group_id;
- $edittitle = _('Edit this document, add version');
- if (forge_get_config('use_object_associations')) {
- $edittitle .= ', '._('associate to other
objects');
- }
- if (forge_get_config('use_docman_review')) {
- $edittitle .= ', '._('create or comment a
review');
- }
if (!$d->getLocked() && !$d->getReserved()) {
$nextcell .=
util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(),
$HTML->getDeletePic(_('Move this document to trash'), 'delfile'));
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/listfile.php | 16 +++++++++-------
tests/func/20_Docs/createDocURLTest.php | 6 +++++-
2 files changed, 14 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
