OCS Inventory: OCSReports

Merge lp:~pieroliste/ocsinventory-ocsreports/trunk into lp:ocsinventory-ocsreports

  1. trunk
  2. Merge into trunk
Proposed by Pierfrancesco Passerini
Status: Merged
Merged at revision: 391
Proposed branch: lp:~pieroliste/ocsinventory-ocsreports/trunk
Merge into: lp:ocsinventory-ocsreports
Diff against target: 65 lines (+12/-3)
4 files modified
plugins/language/english/english.txt (+2/-0)
plugins/language/french/french.txt (+2/-0)
plugins/language/italian/italian.txt (+2/-0)
plugins/main_sections/ms_users/ms_users.php (+6/-3)
To merge this branch: bzr merge lp:~pieroliste/ocsinventory-ocsreports/trunk
Reviewer Review Type Date Requested Status
Erwan Pending
Review via email: mp+28021@code.launchpad.net

This proposal supersedes a proposal from 2010-06-18.

To post a comment you must log in.
Revision history for this message
Erwan (airoine) wrote : Posted in a previous version of this proposal

Hi.

Your modification can't be merge to trunk version. Infact, you can't modifie this values:
        'SUP'=>'ID',
        'MODIF'=>'ID'
to
        $l->g(122)=>'ID',
        $l->g(1118)=>'ID',

If you want change this name of column you have to add this code

$tab_options['LBL']['SUP']=$l->g(122);
$tab_options['LBL']['MODIF']=$l->g(1118);

before tab_req(.

regards

--Erwan

review: Needs Fixing
Revision history for this message
Pierfrancesco Passerini (pieroliste) wrote : Posted in a previous version of this proposal

Hi,
thank you for exposition.
I'll fix all as soon as possible.

Passero

lp:~pieroliste/ocsinventory-ocsreports/trunk updated
391. By Erwan

Use language files. Tx to Pierfrancesco Passerini for this patch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/language/english/english.txt'
2--- plugins/language/english/english.txt 2010-06-17 14:09:43 +0000
3+++ plugins/language/english/english.txt 2010-06-20 17:57:29 +0000
4@@ -1010,6 +1010,8 @@
5 1115 Value of the second attribute that will be used for evaluating the security level of a LDAP user (blank for none)
6 1116 If the second attribute is found and the value matches, set this user role automatically
7 1117 E-mail
8+1118 Edit
9+1119 Select
10
11 5000 [DEBUG]computers insertions request =>[DEBUG]
12 5001 [DEBUG]REQUEST MADE => [DEBUG]
13
14=== modified file 'plugins/language/french/french.txt'
15--- plugins/language/french/french.txt 2010-06-17 14:09:43 +0000
16+++ plugins/language/french/french.txt 2010-06-20 17:57:29 +0000
17@@ -1035,6 +1035,8 @@
18 1115 Valeur du deuxième attribut qui sera utilisé pour évaluer le niveau de sécurité d'un utilisateur LDAP (vide pour aucun)
19 1116 Si le second attribut est trouvé et la valeur correspond, réglez ce profil d'utilisateur automatiquement
20 1117 E-mail
21+1118 Editer
22+1119 Selectionne
23
24 5000 [DEBUG]requête d'insertion de machines =>[DEBUG]
25 5001 [DEBUG]REQUETE JOUEE => [DEBUG]
26
27=== modified file 'plugins/language/italian/italian.txt'
28--- plugins/language/italian/italian.txt 2010-06-17 14:09:43 +0000
29+++ plugins/language/italian/italian.txt 2010-06-20 17:57:29 +0000
30@@ -1009,6 +1009,8 @@
31 1115 Valeur du deuxième attribut qui sera utilisé pour évaluer le niveau de sécurité d'un utilisateur LDAP (vide pour aucun)
32 1116 Si le second attribut est trouvé et la valeur correspond, réglez ce profil d'utilisateur automatiquement
33 1117 E-mail
34+1118 Modifica
35+1119 Seleziona
36
37 5000 [DEBUG]computers insertions request =>[DEBUG]
38 5001 [DEBUG]REQUEST MADE => [DEBUG]
39
40=== modified file 'plugins/main_sections/ms_users/ms_users.php'
41--- plugins/main_sections/ms_users/ms_users.php 2010-06-17 14:09:43 +0000
42+++ plugins/main_sections/ms_users/ms_users.php 2010-06-20 17:57:29 +0000
43@@ -61,7 +61,7 @@
44 $l->g(66)=>'NEW_ACCESSLVL',
45 $l->g(51)=>'COMMENTS',
46 $l->g(1117)=>'EMAIL',
47- 'USER_GROUP'=>'USER_GROUP',
48+ $l->g(607)=>'USER_GROUP',
49 'SUP'=>'ID',
50 'MODIF'=>'ID',
51 'CHECK'=>'ID');
52@@ -83,8 +83,11 @@
53 $res_user_groups = mysql_query( $sql_user_groups, $_SESSION['OCS']["readServer"] );
54 while ($val_user_groups = mysql_fetch_array( $res_user_groups ))
55 $user_groups[$val_user_groups['IVALUE']]=$val_user_groups['TVALUE'];
56-
57- $tab_options['REPLACE_VALUE']['USER_GROUP']=$user_groups;
58+
59+ $tab_options['REPLACE_VALUE'][$l->g(607)]=$user_groups;
60+ $tab_options['LBL']['SUP']=$l->g(122);
61+ $tab_options['LBL']['MODIF']=$l->g(1118);
62+ $tab_options['LBL']['CHECK']=$l->g(1119);
63 tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$queryDetails,$form_name,100,$tab_options);
64 //traitement par lot
65 $img['image/sup_search.png']=$l->g(162);

Subscribers

People subscribed via source and target branches