[Fusionforge-commits] FusionForge branch 6.0 updated. c2f4cb009df3e86c96204b96bff83d596f183bbe

Roland Mas lolando at fusionforge.org
Tue Mar 10 15:06:51 CET 2015


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  c2f4cb009df3e86c96204b96bff83d596f183bbe (commit)
       via  9617029042ed1462d332631f44562b5289db1143 (commit)
      from  e6d4871b0944681bd01a5755d56bed3c709d4c09 (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 -----------------------------------------------------------------
commit c2f4cb009df3e86c96204b96bff83d596f183bbe
Merge: e6d4871 9617029
Author: Roland Mas <lolando at debian.org>
Date:   Tue Mar 10 15:05:49 2015 +0100

    Merge branch 'Branch_5_3' into 6.0

diff --cc src/common/docman/DocumentManager.class.php
index cb99bb7,1136df7..a6d95ac
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@@ -267,12 -266,12 +267,12 @@@ class DocumentManager extends Error 
  		$this->buildArrays($nested_groups, $id_array, $text_array, $dont_display);
  		$rows = count($id_array);
  		switch ($format) {
 -			case "json": {
 +			case 'json': {
- 				$returnString = '{';
+ 				$returnString = '[';
  				for ($i=0; $i<$rows; $i++) {
- 					$returnString .= '\''.util_html_secure(addslashes($text_array[$i])).'\':'.$id_array[$i].',';
+                     $returnString .= '['.$id_array[$i].',\''.util_html_secure(addslashes($text_array[$i])).'\'],';
  				}
- 				$returnString .= '}';
+ 				$returnString .= ']';
  				break;
  			}
  		}
diff --cc src/www/docman/scripts/DocManController.js
index 6950758,f61cdd9..9980c4c
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@@ -332,17 -237,17 +332,17 @@@ DocManListFileController.prototype 
  			}
  		}
  		jQuery('#doc_group').empty();
- 		jQuery.each(this.docparams.docgroupDict, function(key, value) {
- 			jQuery('#doc_group').append(jQuery('<option>').text(key).attr('value',value));
- 		});
+                 for (var i = 0; i < this.docparams.docgroupDict.length; i++) {
+                         jQuery('#doc_group').append(jQuery("<option>").text(this.docparams.docgroupDict[i][1]).attr("value",this.docparams.docgroupDict[i][0]));
+                 };
 -		jQuery('#doc_group option[value='+this.docparams.docgroupId+']').attr("selected", "selected");
 +		jQuery('#doc_group option[value='+this.docparams.docgroupId+']').attr('selected', 'selected');
  		jQuery('#stateid').empty();
  		jQuery.each(this.docparams.statusDict, function(key, value) {
 -			jQuery('#stateid').append(jQuery("<option>").text(key).attr("value",value));
 +			jQuery('#stateid').append(jQuery('<option>').text(key).attr('value',value));
  		});
 -		jQuery('#stateid option[value='+this.docparams.statusId+']').attr("selected", "selected");
 +		jQuery('#stateid option[value='+this.docparams.statusId+']').attr('selected', 'selected');
  		if (this.docparams.isText) {
 -			jQuery.getJSON(this.docparams.docManURL + '/?group_id=' + this.docparams.groupId + '&action=getfile&fileid=' + this.docparams.id , jQuery.proxy(function(data){
 +			jQuery.getJSON(this.docparams.docManURL + '/?group_id=' + this.docparams.groupId + '&action=getfile&type=file&itemid=' + this.docparams.id , jQuery.proxy(function(data){
  				if (data) {
  					jQuery('#defaulteditzone').text(data.body);
  				}

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

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


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list