[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [18481] fixed: accented chars in comments (utf8 issue
From: |
Pascal Vilarem |
Subject: |
[Phpgroupware-cvs] [18481] fixed: accented chars in comments (utf8 issue) |
Date: |
Sun, 10 Feb 2008 09:33:47 +0000 |
Revision: 18481
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18481
Author: maat
Date: 2008-02-10 09:33:46 +0000 (Sun, 10 Feb 2008)
Log Message:
-----------
fixed: accented chars in comments (utf8 issue)
added : select box for relation types in update form.
Modified Paths:
--------------
trunk/ged/inc/class.flow_client.inc.php
trunk/ged/inc/class.ged_dm.inc.php
trunk/ged/templates/base/update_file.tpl
Modified: trunk/ged/inc/class.flow_client.inc.php
===================================================================
--- trunk/ged/inc/class.flow_client.inc.php 2008-02-09 19:59:27 UTC (rev
18480)
+++ trunk/ged/inc/class.flow_client.inc.php 2008-02-10 09:33:46 UTC (rev
18481)
@@ -430,6 +430,8 @@
// print ( 'new version :
'.$version_relation['version_id']."<br/>\n");
// TODO : prepare data for future
relation creation
+ // TOFIX : when obsolete or refused
without current version
+ // TOFIX : there is a problem
$the_new_relations=$this->ged_dm->get_current_version($version_relation['element_id']);
$new_relations[$nri]['linked_version_id']=$the_new_relations['version_id'];
@@ -439,7 +441,7 @@
$new_relations[$nri]['minor']=$the_new_relations['minor'];
$new_relations[$nri]['status']=$the_new_relations['status'];
-
+ // TODO : use real value
$new_relations[$nri]['relation_type']='dependancy';
$nri++;
@@ -455,7 +457,7 @@
$new_relations[$nri]['status']=$version_relation['status'];
$new_relations[$nri]['reference']=$version_relation['reference'];
$new_relations[$nri]['name']=$version_relation['name'];
-
$new_relations[$nri]['relation_type']='dependancy';
+
$new_relations[$nri]['relation_type']=$version_relation['relation_type'];
$nri++;
}
@@ -644,8 +646,25 @@
$this->t->set_var('relations_id_field',
'relations['.$nri.'][linked_version_id]');
$this->t->set_var('relations_id_value',
$new_relation['linked_version_id']);
-
$this->t->set_var('relations_type_field', 'relations['.$nri.'][relation_type]');
-
$this->t->set_var('relations_type_value', $new_relation['relation_type']);
+ $relations_types=Array('dependancy',
'delivery', 'review', 'notice');
+
+
$select_relation_stypes_html="<select
name=\"".'relations['.$nri.'][relation_type]'."\">\n";
+ foreach
($relations_types as $relation_type)
+ {
+ if (
$relation_type == $new_relation['relation_type'])
+ {
+
$selected_flag="selected";
+ }
+ else
+ {
+
$selected_flag="";
+ }
+
+
$select_relation_stypes_html.="<option value=\"".$relation_type."\"
".$selected_flag." >".lang($relation_type)."</option>\n";
+ }
+
$select_relation_stypes_html.="</select>\n";
+
+
$this->t->set_var('relations_type', $select_relation_stypes_html);
$nri++;
$this->t->fp('relations_list_block_handle', 'relations_list_block', True);
Modified: trunk/ged/inc/class.ged_dm.inc.php
===================================================================
--- trunk/ged/inc/class.ged_dm.inc.php 2008-02-09 19:59:27 UTC (rev 18480)
+++ trunk/ged/inc/class.ged_dm.inc.php 2008-02-10 09:33:46 UTC (rev 18481)
@@ -32,11 +32,11 @@
{
@session_register('ged_session');
- // MEMO Le caract�re "administrateur est plut�t li� �
l'activation du module Admin
+ // MEMO Le caractère "administrateur est plutôt lié à
l'activation du module Admin
// MEMO=>existence de
$GLOBALS['phpgw_info']['user']['apps']['admin']
$this->admin=isset($GLOBALS['phpgw_info']['user']['apps']['admin']);
- // MEMO appartenance � des groupes
+ // MEMO appartenance à des groupes
// MEMO $GLOBALS['phpgw']->accounts->memberships[$i][account_id]
if ( $this->admin == false )
@@ -395,7 +395,7 @@
case 'folder':
- // Effacement des sous r�pertoires
+ // Effacement des sous répertoires
$children=$this->list_elements($element_id);
//_debug_array($children);
@@ -468,7 +468,7 @@
else
return "PB download";
- // MEMO attention que if $new_version['status'] est current il
faut rendre obsol�te la "vieille"
+ // MEMO attention que if $new_version['status'] est current il
faut rendre obsolète la "vieille"
if ($download_result=='OK')
{
@@ -572,7 +572,7 @@
else
$download_result='';
- // MEMO attention que if $new_version['status'] est current il
faut rendre obsol�te la "vieille"
+ // MEMO attention que if $new_version['status'] est current il
faut rendre obsolète la "vieille"
if ($download_result=='OK')
{
@@ -2106,7 +2106,7 @@
}
- // Positionnement des droits par d�faut
+ // Positionnement des droits par défaut
// Full droits au groupe Admin (huhu)
// Full droits au createur (presque huhu)
// Heritage des droits du parent
@@ -2285,6 +2285,7 @@
$relations[$i]['reference']=$this->db->f('reference');
$relations[$i]['major']=$this->db->f('major');
$relations[$i]['minor']=$this->db->f('minor');
+
$relations[$i]['relation_type']=$this->db->f('relation_type');
$i ++;
}
}
Modified: trunk/ged/templates/base/update_file.tpl
===================================================================
--- trunk/ged/templates/base/update_file.tpl 2008-02-09 19:59:27 UTC (rev
18480)
+++ trunk/ged/templates/base/update_file.tpl 2008-02-10 09:33:46 UTC (rev
18481)
@@ -125,7 +125,7 @@
<input name="{relations_id_field}" type="hidden"
value="{relations_id_value}"/>
</td>
<td>
- <input name="{relations_type_field}" type="text"
value="{relations_type_value}"/>
+ {relations_type}
</td>
<td>
<input type="image" src="{remove-image}" name="do_remove_relation"
value="{relations_id_value}">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [18481] fixed: accented chars in comments (utf8 issue),
Pascal Vilarem <=