[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] ged inc/class.ged_dm.inc.php inc/class.ged_ui.i...
From: |
Pascal Vilarem |
Subject: |
[Phpgroupware-cvs] ged inc/class.ged_dm.inc.php inc/class.ged_ui.i... |
Date: |
Mon, 16 Jul 2007 13:32:30 +0000 |
CVSROOT: /sources/phpgroupware
Module name: ged
Changes by: Pascal Vilarem <maat> 07/07/16 13:32:30
Modified files:
inc : class.ged_dm.inc.php class.ged_ui.inc.php
templates/base : update_file.tpl
Log message:
Feature : possibility to change quality reference value for admin guys
(todo later : finer acl with project admin rights, technical review
right, quality review rights and final approval rights)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/update_file.tpl?cvsroot=phpgroupware&r1=1.7&r2=1.8
Patches:
Index: inc/class.ged_dm.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_dm.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- inc/class.ged_dm.inc.php 16 Jul 2007 13:06:57 -0000 1.32
+++ inc/class.ged_dm.inc.php 16 Jul 2007 13:32:29 -0000 1.33
@@ -204,6 +204,12 @@
$sep=", ";
}
+ if ( array_key_exists('reference', $new_file) &&
$new_file['reference'] != '' && $this->admin )
+ {
+
$sql.=$sep."reference='".$this->cleanstr($new_file['reference'])."'";
+ $sep=", ";
+ }
+
if ( array_key_exists('validity_period', $new_file) )
$new_file2['validity_period']= (int)
$new_file['validity_period'];
else
Index: inc/class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- inc/class.ged_ui.inc.php 16 Jul 2007 13:06:57 -0000 1.34
+++ inc/class.ged_ui.inc.php 16 Jul 2007 13:32:30 -0000 1.35
@@ -1242,6 +1242,7 @@
$update_file=get_var('update_file', array('POST', 'GET'));
$file_name=get_var('file_name', array('POST', 'GET'));
$file_description=get_var('file_description', array('POST',
'GET'));
+
$referenceq=addslashes(get_var('referenceq',array('GET','POST')));
$update_version=get_var('update_version', array('POST', 'GET'));
$version_description=get_var('version_description',
array('POST', 'GET'));
@@ -1288,6 +1289,7 @@
$this->t->set_var('element_id_field', 'element_id');
$this->t->set_var('file_name_field', 'file_name');
+
$this->t->set_var('file_description_field', 'file_description');
$this->t->set_var('version_description_field',
'version_description');
$this->t->set_var('version_file_field', 'version_file');
@@ -1306,6 +1308,7 @@
$new_file['element_id']=$element_id;
$new_file['name']=$file_name;
+ $new_file['reference']=$referenceq;
$new_file['description']=$file_description;
$new_file['validity_period']=$validity_period;
@@ -1410,6 +1413,7 @@
$file_name=$focused_element['name'];
$file_description=$focused_element['description'];
$validity_period=$focused_element['validity_period'];
+ $referenceq=$focused_element['reference'];
$last_version=$this->ged_dm->get_last_version($element_id);
@@ -1572,6 +1576,8 @@
/* file */
$this->t->set_var('file_description_value', $file_description);
+ $this->t->set_var('new_reference', $referenceq);
+
$this->t->set_var('file_name_value', $file_name);
Index: templates/base/update_file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/update_file.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- templates/base/update_file.tpl 5 Apr 2007 09:27:16 -0000 1.7
+++ templates/base/update_file.tpl 16 Jul 2007 13:32:30 -0000 1.8
@@ -11,13 +11,21 @@
</td>
</tr>
<tr>
-<td style="vertical-align: top; width: 50px;">Name<br>
+<td style="vertical-align: top; width: 50px;">{lang_name}<br>
</td>
<td style="vertical-align: top;"><input type="text"
default_class="{input_default_class}" focused_class="{input_active_class}"
name="{file_name_field}" value="{file_name_value}" size="40" />
</td>
</tr>
<tr>
-<td style="vertical-align: top; width: 50px;">Description<br>
+<td>
+ {lang_reference} :
+</td>
+<td>
+ <input type="text" default_class="{input_default_class}"
focused_class="{input_active_class}" name="{referenceq_field}"
value="{new_reference}" size="40" maxlength="40"/>
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; width: 50px;">{lang_description}<br>
</td>
<td style="vertical-align: top;"><textarea name="{file_description_field}"
name="description" rows="10" cols="50" wrap="off"
>{file_description_value}</textarea>
</td>
- [Phpgroupware-cvs] ged inc/class.ged_dm.inc.php inc/class.ged_ui.i...,
Pascal Vilarem <=