[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] ged templates/base/refuse_file.tpl templates/ba...
|
From: |
Pascal Vilarem |
|
Subject: |
[Phpgroupware-cvs] ged templates/base/refuse_file.tpl templates/ba... |
|
Date: |
Tue, 04 Sep 2007 14:38:27 +0000 |
CVSROOT: /sources/phpgroupware
Module name: ged
Changes by: Pascal Vilarem <maat> 07/09/04 14:38:27
Modified files:
templates/base : refuse_file.tpl approve_file.tpl
reject_file.tpl accept_file.tpl
inc : class.ged_dm.inc.php class.ged_ui.inc.php
Log message:
fixed : internal review for approve / reject
added : guess of chrono reference for review documents
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/refuse_file.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/approve_file.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/reject_file.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/accept_file.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47
Patches:
Index: templates/base/refuse_file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/refuse_file.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/refuse_file.tpl 1 Aug 2007 17:28:48 -0000 1.1
+++ templates/base/refuse_file.tpl 4 Sep 2007 14:38:26 -0000 1.2
@@ -16,6 +16,14 @@
</tr>
<tr>
<td>
+{probable_reference_label} :
+</td>
+<td>
+{probable_reference_value}
+</td>
+</tr>
+<tr>
+<td>
{lang_file} :
</td>
<td>
Index: templates/base/approve_file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/approve_file.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/approve_file.tpl 30 Aug 2007 17:03:22 -0000 1.1
+++ templates/base/approve_file.tpl 4 Sep 2007 14:38:26 -0000 1.2
@@ -16,6 +16,14 @@
</tr>
<tr>
<td>
+{probable_reference_label} :
+</td>
+<td>
+{probable_reference_value}
+</td>
+</tr>
+<tr>
+<td>
{lang_file} :
</td>
<td>
Index: templates/base/reject_file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/reject_file.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/reject_file.tpl 1 Aug 2007 17:28:49 -0000 1.1
+++ templates/base/reject_file.tpl 4 Sep 2007 14:38:26 -0000 1.2
@@ -16,6 +16,14 @@
</tr>
<tr>
<td>
+{probable_reference_label} :
+</td>
+<td>
+{probable_reference_value}
+</td>
+</tr>
+<tr>
+<td>
{lang_file} :
</td>
<td>
Index: templates/base/accept_file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/accept_file.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/accept_file.tpl 30 Aug 2007 17:03:22 -0000 1.1
+++ templates/base/accept_file.tpl 4 Sep 2007 14:38:26 -0000 1.2
@@ -16,6 +16,14 @@
</tr>
<tr>
<td>
+{probable_reference_label} :
+</td>
+<td>
+{probable_reference_value}
+</td>
+</tr>
+<tr>
+<td>
{lang_file} :
</td>
<td>
Index: inc/class.ged_dm.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_dm.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- inc/class.ged_dm.inc.php 31 Aug 2007 09:49:31 -0000 1.45
+++ inc/class.ged_dm.inc.php 4 Sep 2007 14:38:26 -0000 1.46
@@ -2154,7 +2154,7 @@
$new_file=$comment_file;
$new_file=$comment_file;
-
$new_file['doc_type']=$this->external_review_file_type;
+
$new_file['doc_type']=$this->internal_review_file_type;
$new_file['name']=$this->get_type_desc($new_file['doc_type'])." /
".$element['name'];
$new_file['description']=$comment;
$new_file['reference']=$this->get_next_available_reference($new_file['doc_type'],
$element['project_root'] );
@@ -2335,7 +2335,7 @@
if (isset($comment_file) &&
$comment_file['file_name'] != "")
{
$new_file=$comment_file;
-
$new_file['doc_type']=$this->external_review_file_type;
+
$new_file['doc_type']=$this->internal_review_file_type;
$new_file['name']=$this->get_type_desc($new_file['doc_type'])." /
".$element['name'];
$new_file['description']=$comment;
$new_file['reference']=$this->get_next_available_reference($new_file['doc_type'],
$element['project_root'] );
Index: inc/class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- inc/class.ged_ui.inc.php 30 Aug 2007 17:03:21 -0000 1.46
+++ inc/class.ged_ui.inc.php 4 Sep 2007 14:38:27 -0000 1.47
@@ -2336,6 +2336,8 @@
// element data
$element_id=get_var('element_id', array('GET', 'POST'));
$pending_version=$this->ged_dm->get_pending_for_internal_review($element_id);
+ $element=$this->ged_dm->get_element_info($element_id);
+
// Comment file data
$accept_file=get_var('accept_file',array('POST'));
$comment=addslashes(get_var('comment', array( 'POST')));
@@ -2363,6 +2365,9 @@
$this->t->set_file(array('accept_file_tpl'=>'accept_file.tpl'));
+ $this->t->set_var('probable_reference_label', lang('Probable
reference'));
+ $this->t->set_var('probable_reference_value',
$this->ged_dm->get_next_available_reference($this->ged_dm->external_review_file_type,
$element['project_root']));
+
$this->t->set_var('element_id_value', $element_id);
$this->t->set_var('comment_field', 'comment');
$this->t->set_var('comment_label', lang('comment'));
@@ -2395,6 +2400,8 @@
// element data
$element_id=get_var('element_id', array('GET', 'POST'));
$pending_version=$this->ged_dm->get_pending_for_internal_review($element_id);
+ $element=$this->ged_dm->get_element_info($element_id);
+
// Comment file data
$reject_file=get_var('reject_file',array('POST'));
$comment=addslashes(get_var('comment', array( 'POST')));
@@ -2422,6 +2429,9 @@
$this->t->set_file(array('reject_file_tpl'=>'reject_file.tpl'));
+ $this->t->set_var('probable_reference_label', lang('Probable
reference'));
+ $this->t->set_var('probable_reference_value',
$this->ged_dm->get_next_available_reference($this->ged_dm->internal_review_file_type,
$element['project_root']));
+
$this->t->set_var('element_id_value', $element_id);
$this->t->set_var('comment_field', 'comment');
$this->t->set_var('comment_label', lang('comment'));
@@ -2441,6 +2451,8 @@
// element data
$element_id=get_var('element_id', array('GET', 'POST'));
$pending_version=$this->ged_dm->get_pending_for_internal_review($element_id);
+ $element=$this->ged_dm->get_element_info($element_id);
+
// Comment file data
$approve_file=get_var('approve_file',array('POST'));
$comment=addslashes(get_var('comment', array( 'POST')));
@@ -2468,6 +2480,9 @@
$this->t->set_file(array('approve_file_tpl'=>'approve_file.tpl'));
+ $this->t->set_var('probable_reference_label', lang('Probable
reference'));
+ $this->t->set_var('probable_reference_value',
$this->ged_dm->get_next_available_reference($this->ged_dm->internal_review_file_type,
$element['project_root']));
+
$this->t->set_var('element_id_value', $element_id);
$this->t->set_var('comment_field', 'comment');
$this->t->set_var('comment_label', lang('comment'));
@@ -2500,6 +2515,8 @@
// element data
$element_id=get_var('element_id', array('GET', 'POST'));
$pending_version=$this->ged_dm->get_pending_for_internal_review($element_id);
+ $element=$this->ged_dm->get_element_info($element_id);
+
// Comment file data
$refuse_file=get_var('refuse_file',array('POST'));
$comment=addslashes(get_var('comment', array( 'POST')));
@@ -2527,6 +2544,9 @@
$this->t->set_file(array('refuse_file_tpl'=>'refuse_file.tpl'));
+ $this->t->set_var('probable_reference_label', lang('Probable
reference'));
+ $this->t->set_var('probable_reference_value',
$this->ged_dm->get_next_available_reference($this->ged_dm->external_review_file_type,
$element['project_root']));
+
$this->t->set_var('element_id_value', $element_id);
$this->t->set_var('comment_field', 'comment');
$this->t->set_var('comment_label', lang('comment'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] ged templates/base/refuse_file.tpl templates/ba...,
Pascal Vilarem <=