[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1242-gd382684

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Dec 17 15:46:53 CET 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  d382684f42267a48ddf649d39bdbe5123e2f4eb5 (commit)
       via  7474b0f2ff7e5c2c5ce5aa75c2bb5b901ccf3928 (commit)
       via  b1bfe1dd4dd94f7a5c1937e28ad2d5438dde98fd (commit)
      from  34583cc0f2bc5efa6956d7fb3186639192045704 (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=d382684f42267a48ddf649d39bdbe5123e2f4eb5

commit d382684f42267a48ddf649d39bdbe5123e2f4eb5
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 17 15:46:34 2016 +0100

    fix add item when browsing in child group

diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index 8f4709f..5dc004d 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -330,7 +330,7 @@ DocManListFileController.prototype =
 	 */
 	toggleAddItemView: function() {
 		if (!this.listfileparams.divAddItem.is(":visible")) {
-			jQuery.getJSON(this.listfileparams.docManURL + '/?group_id='+this.listfileparams.groupId+'&action=lock&json=1&type=dir&itemid='+this.listfileparams.docgroupId, jQuery.proxy(function(data){
+			jQuery.getJSON(this.listfileparams.docManURL + '/?group_id='+this.listfileparams.groupId+'&action=lock&json=1&type=dir&itemid='+this.listfileparams.docgroupId+'&childgroup_id='+this.listfileparams.childGroupId, jQuery.proxy(function(data){
 				if (typeof data.html != 'undefined') {
 					jQuery('#maindiv > .feedback').remove();
 					jQuery('#maindiv > .error').remove();

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7474b0f2ff7e5c2c5ce5aa75c2bb5b901ccf3928

commit 7474b0f2ff7e5c2c5ce5aa75c2bb5b901ccf3928
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 17 15:44:08 2016 +0100

    fix edit docgroup when access from a child project

diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index 1744daf..8f4709f 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -269,7 +269,7 @@ DocManListFileController.prototype =
 	 */
 	toggleEditDirectoryView: function() {
 		if (!this.listfileparams.divEditDirectory.is(":visible")) {
-			jQuery.getJSON(this.listfileparams.docManURL + '/?group_id='+this.listfileparams.groupId+'&action=lock&json=1&type=dir&itemid='+this.listfileparams.docgroupId, jQuery.proxy(function(data){
+			jQuery.getJSON(this.listfileparams.docManURL + '/?group_id='+this.listfileparams.groupId+'&action=lock&json=1&type=dir&itemid='+this.listfileparams.docgroupId+'&childgroup_id='+this.listfileparams.childGroupId, jQuery.proxy(function(data){
 				if (typeof data.html != 'undefined') {
 					jQuery('#maindiv > .feedback').remove();
 					jQuery('#maindiv > .error').remove();
@@ -652,7 +652,6 @@ DocManListFileController.prototype =
 
 	deleteVersion: function(params) {
 		this.delversion = params;
-		console.log(this);
 		jQuery.getJSON(this.listfileparams.docManURL + '/?group_id=' + this.delversion.groupId + '&action=deleteversion&docid='+this.delversion.docid+'&version='+this.delversion.version , 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=b1bfe1dd4dd94f7a5c1937e28ad2d5438dde98fd

commit b1bfe1dd4dd94f7a5c1937e28ad2d5438dde98fd
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 17 15:23:50 2016 +0100

    fix delete version & display description correctly

diff --git a/src/common/docman/DocumentVersionFactory.class.php b/src/common/docman/DocumentVersionFactory.class.php
index e61f502..5178802 100644
--- a/src/common/docman/DocumentVersionFactory.class.php
+++ b/src/common/docman/DocumentVersionFactory.class.php
@@ -86,9 +86,12 @@ class DocumentVersionFactory extends FFError {
 				if (preg_match('/html/i', $arr['filetype'])) { // text plain, text html, text x-patch, etc
 					$isHtml = 1;
 				}
+				$new_description = util_gen_cross_ref($arr['description'], $this->Document->Group->getID());
+				$new_description = nl2br($new_description);
+				$arr['description'] = $new_description;
 				$arr['versionactions'][] = util_make_link('#', $HTML->getEditFilePic(_('Edit this version'), 'editversion'), array('id' => 'version_action_edit', 'onclick' => 'javascript:controllerListFile.toggleEditVersionView({title: \''.addslashes($arr['title']).'\', description: '.json_encode($arr['description']).', version: '.ltrim($arr['version'], '_').', current_version: '.$arr['current_version'].', isURL: '.$isURL.', isText: '.$isText.', isHtml: '.$isHtml.', filename: \''.addslashes($arr['filename']).'\', vcomment: \''.addslashes($arr['vcomment']).'\', docid: '.$arr['docid'].', groupId: '.$this->Document->Group->getID().'})'), true);
 				if ($numrows > 1) {
-					$arr['versionactions'][] = util_make_link('#', $HTML->getRemovePic(_('Permanently delete this version'), 'delversion'), array('id' => 'version_action_delete', 'onclick' => 'javascript:controllerListFile.deleteVersion({version: '.ltrim($arr['version'], '_').'})'), true);
+					$arr['versionactions'][] = util_make_link('#', $HTML->getRemovePic(_('Permanently delete this version'), 'delversion'), array('id' => 'version_action_delete', 'onclick' => 'javascript:controllerListFile.deleteVersion({version: '.ltrim($arr['version'], '_').', docid: '.$arr['docid'].', groupId: '.$this->Document->Group->getID().'})'), true);
 				}
 				$versions[$arr['version']] = $arr;
 			}
diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index a8cd2d8..1744daf 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -652,7 +652,8 @@ DocManListFileController.prototype =
 
 	deleteVersion: function(params) {
 		this.delversion = params;
-		jQuery.getJSON(this.docparams.docManURL + '/?group_id=' + this.docparams.groupId + '&action=deleteversion&docid='+this.docparams.id+'&version='+this.delversion.version , jQuery.proxy(function(data){
+		console.log(this);
+		jQuery.getJSON(this.listfileparams.docManURL + '/?group_id=' + this.delversion.groupId + '&action=deleteversion&docid='+this.delversion.docid+'&version='+this.delversion.version , jQuery.proxy(function(data){
 				if (typeof data.html != 'undefined') {
 					jQuery('#editFile > .feedback').remove();
 					jQuery('#editFile > .error').remove();

-----------------------------------------------------------------------

Summary of changes:
 src/common/docman/DocumentVersionFactory.class.php | 5 ++++-
 src/www/docman/scripts/DocManController.js         | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list