[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] ged templates/base/add_file.tpl inc/class.ged_d...
From: |
Pascal Vilarem |
Subject: |
[Phpgroupware-cvs] ged templates/base/add_file.tpl inc/class.ged_d... |
Date: |
Mon, 16 Jul 2007 12:41:09 +0000 |
CVSROOT: /sources/phpgroupware
Module name: ged
Changes by: Pascal Vilarem <maat> 07/07/16 12:41:08
Modified files:
templates/base : add_file.tpl
inc : class.ged_dm.inc.php class.ged_ui.inc.php
Log message:
Feature : possibility to setup first version numbers
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/add_file.tpl?cvsroot=phpgroupware&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33
Patches:
Index: templates/base/add_file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/add_file.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- templates/base/add_file.tpl 30 Mar 2006 12:29:24 -0000 1.1.1.1
+++ templates/base/add_file.tpl 16 Jul 2007 12:41:08 -0000 1.2
@@ -24,6 +24,14 @@
</tr>
<tr>
<td>
+ {lang_version} :
+</td>
+<td>
+ <input type="text" default_class="{input_default_class}"
focused_class="{input_active_class}" name="{major_field}"
value="{major_reference}" size="2" maxlength="2"/> . <input type="text"
default_class="{input_default_class}" focused_class="{input_active_class}"
name="{minor_field}" value="{minor_reference}" size="2" maxlength="2"/>
+</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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- inc/class.ged_dm.inc.php 16 Jul 2007 09:57:49 -0000 1.30
+++ inc/class.ged_dm.inc.php 16 Jul 2007 12:41:08 -0000 1.31
@@ -164,7 +164,10 @@
$sql_model1="INSERT INTO %s ( size, file_name,
stored_name, file_extension, creator_id, creation_date, status, element_id,
description, major, minor ) VALUES ";
$sql_model1.=" ( %d, '%s', '%s', '%s', %d, %d, '%s',
%d, '%s', %d, %d ) ";
- $sql1=sprintf($sql_model1, $this->tables['versions'],
$new_file['file_size'], $new_file['file_name'], $candidate_name, $extension,
$GLOBALS['phpgw_info']['user']['account_id'], time(), 'working',
$new_element_id, lang("First version"), 0, 1);
+ $major=(int)$new_file['major'];
+ $minor=(int)$new_file['minor'];
+
+ $sql1=sprintf($sql_model1, $this->tables['versions'],
$new_file['file_size'], $new_file['file_name'], $candidate_name, $extension,
$GLOBALS['phpgw_info']['user']['account_id'], time(), 'working',
$new_element_id, lang("First version"), $major, $minor);
//print ("<br/>".$sql1);
Index: inc/class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- inc/class.ged_ui.inc.php 16 Jul 2007 09:57:49 -0000 1.32
+++ inc/class.ged_ui.inc.php 16 Jul 2007 12:41:08 -0000 1.33
@@ -177,12 +177,16 @@
$this->t->set_var('lang_keywords', lang('Keywords'));
$this->t->set_var('lang_last_maj', lang('Last updated on'));
$this->t->set_var('lang_current_version', lang('Current
version'));
+ $this->t->set_var('major_field', 'major');
+ $this->t->set_var('minor_field','minor');
+
$this->t->set_var('lang_version', lang('Version'));
$this->t->set_var('lang_version_creation_date', lang('creation
date'));
$this->t->set_var('lang_version_description',
lang('description'));
$this->t->set_var('lang_version_creator', lang('Uploaded by'));
+
$this->t->set_var('lang_add_file', lang('Add file'));
$this->t->set_var('lang_add_folder', lang('Add folder'));
$this->t->set_var('lang_update_file', lang('Update file'));
@@ -1117,6 +1121,8 @@
$add_file=get_var('add_file',array('GET','POST'));
$name=addslashes(get_var('name',array('GET','POST')));
$referenceq=addslashes(get_var('referenceq',array('GET','POST')));
+ $major=addslashes(get_var('major',array('GET','POST')));
+ $minor=addslashes(get_var('minor',array('GET','POST')));
$description=addslashes(get_var('description', array('GET',
'POST')));
$validity_period=get_var('validity_period', array('GET',
'POST'));
@@ -1135,6 +1141,8 @@
$new_file['parent_id']=$parent_id;
$new_file['name']=$name;
$new_file['reference']=$referenceq;
+ $new_file['major']=$major;
+ $new_file['minor']=$minor;
$new_file['description']=$description;
$new_file['validity_period']=$validity_period;
@@ -1162,12 +1170,17 @@
if ($reference !="")
$this->t->set_var('new_reference', $reference);
+ elseif ( isset($parent_element['reference']))
+ $this->t->set_var('new_reference',
$parent_element['reference']);
else
- $this->t->set_var('new_reference',
$parent_element['reference']."/");
+ $this->t->set_var('new_reference', "");
$this->t->set_var('parent_id_value', $parent_id);
$this->t->set_var('name_value', $name);
$this->t->set_var('description_value', $description);
+ $this->t->set_var('major_reference', 0);
+ $this->t->set_var('minor_reference', 1);
+
$add_link_data['menuaction']='ged.ged_ui.add_file';
$this->t->set_var('action_add',
$GLOBALS['phpgw']->link('/index.php', $add_link_data));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] ged templates/base/add_file.tpl inc/class.ged_d...,
Pascal Vilarem <=