[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1251-gd8530c6

[Franck Villaume]

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  d8530c6c8cbb78b9e7915c0401a78af2e06ae645 (commit)
      from  b7f0de45de9ac23ab660b74b4c0024dcb1a978c7 (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=d8530c6c8cbb78b9e7915c0401a78af2e06ae645

commit d8530c6c8cbb78b9e7915c0401a78af2e06ae645
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Dec 18 15:47:54 2016 +0100

    remove duplicate div when canceling edition

diff --git a/src/common/docman/DocumentReview.class.php b/src/common/docman/DocumentReview.class.php
index fc5b5f9..97b2702 100644
--- a/src/common/docman/DocumentReview.class.php
+++ b/src/common/docman/DocumentReview.class.php
@@ -327,7 +327,7 @@ class DocumentReview extends FFError {
 			$return .= html_e('div', array('id' => 'editfile-userstatusreview'), '', false);
 			$return .= html_e('div', array('id' => 'editfile-completedreview'), '', false);
 			$javascript = 'jQuery("#datepicker_end_review_date").datepicker({dateFormat: "'.$date_format_js.'"});';
-			$return .= html_e('script', array( 'type'=>'text/javascript'), '//<![CDATA['."\n".$javascript."\n".'//]]>');
+			$return .= html_e('script', array( 'type'=>'text/javascript', 'id' => 'editfile-datepickerreview-script'), '//<![CDATA['."\n".$javascript."\n".'//]]>');
 		} else {
 			$return = $HTML->error_msg(_('Cannot get Document Versions'));
 		}
diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index 92892cc..645b3a2 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -184,6 +184,9 @@ DocManListFileController.prototype =
 			});
 			clearInterval(this.lockInterval[id]);
 			clearInterval(this.lockInterval[this.listfileparams.docgroupId]);
+			jQuery('#editfile-userstatusreview').remove();
+			jQuery('#editfile-completedreview').remove();
+			jQuery('#editfile-datepickerreview-script').remove();
 		}, this));
 	},
 

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

Summary of changes:
 src/common/docman/DocumentReview.class.php | 2 +-
 src/www/docman/scripts/DocManController.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge