[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 5d14ee28a8c6cf928dc3d68066ecdeaaae5fabcc
Franck VILLAUME
nerville at fusionforge.org
Thu Apr 18 20:56:28 CEST 2013
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, Branch_5_2 has been updated
via 5d14ee28a8c6cf928dc3d68066ecdeaaae5fabcc (commit)
via 060ce9bceaa807a08de0f1c03c621f5e48080b5f (commit)
from fecdfbd2cfed11dee1cb77ebddf4b201ddce1a8b (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 5d14ee28a8c6cf928dc3d68066ecdeaaae5fabcc
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Apr 18 20:54:30 2013 +0200
docman: fix apostrophe in title and description when editing file
diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php
index 30a4f7c..61ba282 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -305,7 +305,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
$editfileaction .= '&group_id='.$GLOBALS['group_id'];
if (!$d->getLocked() && !$d->getReserved()) {
echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=trashfile&fileid='.$d->getID().'" title="'. _('Move this document to trash') .'" >'.html_image('docman/trash-empty.png',22,22,array('alt'=>_('Move to trash this document'))). '</a>';
- echo '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListFile.toggleEditFileView({action:\''.$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:\''.$d->getName().'\', filename:\''.$d->getFilename().'\', description:\''.$d->getDescription().'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})" title="'. _('Edit this document') .'" >'.html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))). '</a>';
+ echo '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListFile.toggleEditFileView({action:\''.$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:\''.$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') .'" >'.html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))). '</a>';
if (session_loggedin()) {
echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=reservefile&fileid='.$d->getID().'" title="'. _('Reserve this document for later edition') .'" >'.html_image('docman/reserve-document.png',22,22,array('alt'=>_('Reserve this document'))). '</a>';
}
@@ -316,7 +316,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
}
} else {
echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=trashfile&fileid='.$d->getID().'" title="'. _('Move this document to trash') .'" >'.html_image('docman/trash-empty.png',22,22,array('alt'=>_('Move to trash this document'))). '</a>';
- echo '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListFile.toggleEditFileView({action:\''.$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:\''.$d->getName().'\', filename:\''.$d->getFilename().'\', description:\''.$d->getDescription().'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})" title="'. _('Edit this document') .'" >'.html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))). '</a>';
+ echo '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListFile.toggleEditFileView({action:\''.$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:\''.$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') .'" >'.html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))). '</a>';
echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=releasefile&fileid='.$d->getID().'" title="'. _('Release reservation') .'" >'.html_image('docman/release-document.png',22,22,array('alt'=>_('Release reservation'))). '</a>';
}
}
commit 060ce9bceaa807a08de0f1c03c621f5e48080b5f
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Apr 18 20:51:21 2013 +0200
Revert "use correct JSON encoding"
This reverts commit 88e6ca54e50e1631d4233da4c158502c8f2452bc.
diff --git a/src/common/docman/DocumentManager.class.php b/src/common/docman/DocumentManager.class.php
index f029987..cfffdfd 100644
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@ -24,7 +24,6 @@
require_once $gfcommon.'include/Error.class.php';
require_once $gfcommon.'include/User.class.php';
-require_once $gfcommon.'include/minijson.php';
require_once $gfcommon.'docman/DocumentGroup.class.php';
class DocumentManager extends Error {
@@ -211,11 +210,13 @@ class DocumentManager extends Error {
}
switch ($format) {
case 'json': {
- $state_values = array();
+ $returnString = '{';
while ($stateArr = db_fetch_array($stateQuery)) {
- $state_values[$stateArr['name']] = $stateArr['stateid'];
+ $returnString .= util_html_secure($stateArr['name']).': \''.$stateArr['stateid'].'\',';
}
- return minijson_encode($state_values, false);
+ $returnString .= '}';
+ return $returnString;
+ break;
}
default: {
return $stateQuery;
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentManager.class.php | 9 +++++----
src/common/docman/views/listfile.php | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list