From 4a32aada4798c8d61d977e298ca816cac7afcc43 Mon Sep 17 00:00:00 2001 From: xaver Date: Mon, 19 Mar 2012 22:05:27 +0000 Subject: [PATCH] removed Forname and lastanme from sys_users list, added active and client_id -> grate to get relatons if you wanna deactivate a user --- TODO.txt | 2 - .../web/admin/lib/lang/ar_users_list.lng | 5 +-- .../web/admin/lib/lang/bg_users_list.lng | 5 +-- .../web/admin/lib/lang/br_users_list.lng | 5 +-- .../web/admin/lib/lang/cz_users_list.lng | 5 +-- .../web/admin/lib/lang/de_users_list.lng | 5 +-- .../web/admin/lib/lang/el_users_list.lng | 5 +-- .../web/admin/lib/lang/en_users_list.lng | 5 +-- .../web/admin/lib/lang/es_users_list.lng | 5 +-- .../web/admin/lib/lang/fi_users_list.lng | 5 +-- .../web/admin/lib/lang/fr_users_list.lng | 5 +-- .../web/admin/lib/lang/hr_users_list.lng | 5 +-- .../web/admin/lib/lang/hu_users_list.lng | 5 +-- .../web/admin/lib/lang/id_users_list.lng | 5 +-- .../web/admin/lib/lang/it_users_list.lng | 5 +-- .../web/admin/lib/lang/ja_users_list.lng | 5 +-- .../web/admin/lib/lang/nl_users_list.lng | 5 +-- .../web/admin/lib/lang/pl_users_list.lng | 5 +-- .../web/admin/lib/lang/pt_users_list.lng | 5 +-- .../web/admin/lib/lang/ro_users_list.lng | 5 +-- .../web/admin/lib/lang/ru_users_list.lng | 5 +-- .../web/admin/lib/lang/se_users_list.lng | 5 +-- .../web/admin/lib/lang/sk_users_list.lng | 5 +-- .../web/admin/lib/lang/tr_users_list.lng | 5 +-- interface/web/admin/list/users.list.php | 38 +++++++++---------- interface/web/admin/templates/users_list.htm | 15 +++----- 26 files changed, 70 insertions(+), 100 deletions(-) diff --git a/TODO.txt b/TODO.txt index 08ab80eddd..8544dff263 100644 --- a/TODO.txt +++ b/TODO.txt @@ -86,8 +86,6 @@ Remoting framework Interface -------------------------------------- - -- Enhance the list function to allow sorting by column - Enhance the paging in lists (e.g. like this: [1 2 3 4 ... 10]) General tasks diff --git a/interface/web/admin/lib/lang/ar_users_list.lng b/interface/web/admin/lib/lang/ar_users_list.lng index 0de8cdc3ef..262e493fdb 100644 --- a/interface/web/admin/lib/lang/ar_users_list.lng +++ b/interface/web/admin/lib/lang/ar_users_list.lng @@ -1,9 +1,8 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> diff --git a/interface/web/admin/lib/lang/bg_users_list.lng b/interface/web/admin/lib/lang/bg_users_list.lng index 0de8cdc3ef..262e493fdb 100644 --- a/interface/web/admin/lib/lang/bg_users_list.lng +++ b/interface/web/admin/lib/lang/bg_users_list.lng @@ -1,9 +1,8 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> diff --git a/interface/web/admin/lib/lang/br_users_list.lng b/interface/web/admin/lib/lang/br_users_list.lng index d21054a084..9754618d32 100644 --- a/interface/web/admin/lib/lang/br_users_list.lng +++ b/interface/web/admin/lib/lang/br_users_list.lng @@ -1,9 +1,8 @@ AVISO: Não modifique ou edite qualquer configuração de usuário aqui. Use o módulo de cliente ou revendedor. Modificar ou alterar usuários e grupos aqui pode ocasionar perda de dados!'; ?> diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng index 99390611ad..1754737104 100644 --- a/interface/web/admin/lib/lang/cz_users_list.lng +++ b/interface/web/admin/lib/lang/cz_users_list.lng @@ -1,9 +1,8 @@ VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!'; ?> diff --git a/interface/web/admin/lib/lang/de_users_list.lng b/interface/web/admin/lib/lang/de_users_list.lng index 73a6195179..2564b8dbfa 100644 --- a/interface/web/admin/lib/lang/de_users_list.lng +++ b/interface/web/admin/lib/lang/de_users_list.lng @@ -1,9 +1,8 @@ WARNUNG: Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!'; ?> diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng index 09218d251f..be0ffebcde 100644 --- a/interface/web/admin/lib/lang/el_users_list.lng +++ b/interface/web/admin/lib/lang/el_users_list.lng @@ -1,9 +1,8 @@ ΠΡΟΕΙΔΟΠΟΙΗΣΗ:Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!'; ?> diff --git a/interface/web/admin/lib/lang/en_users_list.lng b/interface/web/admin/lib/lang/en_users_list.lng index 1042cd35b1..44d7c88e84 100644 --- a/interface/web/admin/lib/lang/en_users_list.lng +++ b/interface/web/admin/lib/lang/en_users_list.lng @@ -1,9 +1,8 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> \ No newline at end of file diff --git a/interface/web/admin/lib/lang/es_users_list.lng b/interface/web/admin/lib/lang/es_users_list.lng index ec368916ff..3b5f787955 100644 --- a/interface/web/admin/lib/lang/es_users_list.lng +++ b/interface/web/admin/lib/lang/es_users_list.lng @@ -1,9 +1,8 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> diff --git a/interface/web/admin/lib/lang/fi_users_list.lng b/interface/web/admin/lib/lang/fi_users_list.lng index 249b5cfc37..bd078e9354 100755 --- a/interface/web/admin/lib/lang/fi_users_list.lng +++ b/interface/web/admin/lib/lang/fi_users_list.lng @@ -1,9 +1,8 @@ VAROITUS: Aälä muokkaa mitään käyttäjäasetuksia täällä. Käytä Asiakas- ja Jälleenmyyjä-asetuksia Asiakkaat-moduulissa. Käyttäjien tai ryhmien muokkaus tässä voi aiheuttaa tietojen katoamista!'; ?> diff --git a/interface/web/admin/lib/lang/fr_users_list.lng b/interface/web/admin/lib/lang/fr_users_list.lng index af8cebc510..76a865f638 100644 --- a/interface/web/admin/lib/lang/fr_users_list.lng +++ b/interface/web/admin/lib/lang/fr_users_list.lng @@ -1,9 +1,8 @@ ATTENTION: Ne pas éditer ou modifier de paramètre utilisateur ici. Utilisez les paramètres Client et Revendeur dans le module Client à la place. Modifier ou changer les informations ici peut conduire à la perte de données'; ?> diff --git a/interface/web/admin/lib/lang/hr_users_list.lng b/interface/web/admin/lib/lang/hr_users_list.lng index b960e14750..81a844c7ed 100644 --- a/interface/web/admin/lib/lang/hr_users_list.lng +++ b/interface/web/admin/lib/lang/hr_users_list.lng @@ -1,9 +1,8 @@ UPOZORENJE: Ovdje nemojte mijenjati podatke klijenta. Koristite Klijent i Preprodavač postavke u Klijent modulu. Mijenjanjem postavki klijenata ili grupa može doći do gubitka podataka!'; ?> diff --git a/interface/web/admin/lib/lang/hu_users_list.lng b/interface/web/admin/lib/lang/hu_users_list.lng index 0b4f5f3881..0610c76528 100644 --- a/interface/web/admin/lib/lang/hu_users_list.lng +++ b/interface/web/admin/lib/lang/hu_users_list.lng @@ -1,9 +1,8 @@ FIGYELEM: Ne módosítsa a felhasználók adatait ezen a helyen. Használja az Ügyfél vagy Viszonteladó szerkesztését az Ügyfél modulban!'; ?> diff --git a/interface/web/admin/lib/lang/id_users_list.lng b/interface/web/admin/lib/lang/id_users_list.lng index 830b070b07..ca687733e3 100644 --- a/interface/web/admin/lib/lang/id_users_list.lng +++ b/interface/web/admin/lib/lang/id_users_list.lng @@ -1,9 +1,8 @@ PERINGATAN: Jangan menyunting atau memodifikasi pengaturan pengguna apapun di sini. Gunakan Pengaturan Klien dan Reseller di modul Klien. Memodifikasi atau mengubah Pengguna atau Grup di sini dapat mengakibatkan kehilangan data!'; ?> diff --git a/interface/web/admin/lib/lang/it_users_list.lng b/interface/web/admin/lib/lang/it_users_list.lng index fdee4eb06f..bc9211022c 100644 --- a/interface/web/admin/lib/lang/it_users_list.lng +++ b/interface/web/admin/lib/lang/it_users_list.lng @@ -1,9 +1,8 @@ ATTENZIONE: non editare o modificare alcuna impostazione utente in questa schermata. Usare piuttosto le impostazioni Cliente/Rivenditore del modulo Clienti. Modificare Utenti o gruppi in questa schermata può provocare la perdita di dati.'; ?> diff --git a/interface/web/admin/lib/lang/ja_users_list.lng b/interface/web/admin/lib/lang/ja_users_list.lng index 2ab8d227fc..2d35c8b699 100644 --- a/interface/web/admin/lib/lang/ja_users_list.lng +++ b/interface/web/admin/lib/lang/ja_users_list.lng @@ -1,9 +1,8 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> diff --git a/interface/web/admin/lib/lang/nl_users_list.lng b/interface/web/admin/lib/lang/nl_users_list.lng index 188ab19522..deee74ef32 100644 --- a/interface/web/admin/lib/lang/nl_users_list.lng +++ b/interface/web/admin/lib/lang/nl_users_list.lng @@ -1,9 +1,8 @@ WAARSCHUWING: Wijzig hier geen enkele gebruikersinstelling. Voor het aanbrengen van wijzigingen gebruikt u de klanten module. Het hier wijzigen van gebruikers of groepen kan dataverlies tot gevolg hebben!!!'; ?> diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng index 17d72250c0..7c7ead6634 100644 --- a/interface/web/admin/lib/lang/pl_users_list.lng +++ b/interface/web/admin/lib/lang/pl_users_list.lng @@ -1,9 +1,8 @@ OSTRZEŻENIE: Nie edytuj żadnych ustawień tutaj. Użyj do tego celu ustawień Klienta i Resellera w module Klienta. Zmiana użytkowników i grup w tym miejscu może spowodować utratę danych!'; ?> diff --git a/interface/web/admin/lib/lang/pt_users_list.lng b/interface/web/admin/lib/lang/pt_users_list.lng index a9a664192b..1f9817a10a 100644 --- a/interface/web/admin/lib/lang/pt_users_list.lng +++ b/interface/web/admin/lib/lang/pt_users_list.lng @@ -1,9 +1,8 @@ AVISO: Não modifique ou edite qualquer configuração de utilizador aqui. Use o módulo de cliente ou revendedor. Modificar ou alterar utilizadors e grupos aqui pode resultar na perda de dados!'; ?> diff --git a/interface/web/admin/lib/lang/ro_users_list.lng b/interface/web/admin/lib/lang/ro_users_list.lng index 16d8179fa4..78a514c45e 100644 --- a/interface/web/admin/lib/lang/ro_users_list.lng +++ b/interface/web/admin/lib/lang/ro_users_list.lng @@ -1,9 +1,8 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> diff --git a/interface/web/admin/lib/lang/ru_users_list.lng b/interface/web/admin/lib/lang/ru_users_list.lng index f39233dd52..4fe9295d23 100644 --- a/interface/web/admin/lib/lang/ru_users_list.lng +++ b/interface/web/admin/lib/lang/ru_users_list.lng @@ -1,9 +1,8 @@ ВНИМАНИЕ:Не удаляйте и не меняйте никаких настроек здесь. Используйте настройки клиента и реселлера в модуле КЛИЕНТ. Изменение пользователей или групп здесь может вызвать потерю данных!'; ?> diff --git a/interface/web/admin/lib/lang/se_users_list.lng b/interface/web/admin/lib/lang/se_users_list.lng index de5d63e2fd..b330f53ff2 100644 --- a/interface/web/admin/lib/lang/se_users_list.lng +++ b/interface/web/admin/lib/lang/se_users_list.lng @@ -1,9 +1,8 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> diff --git a/interface/web/admin/lib/lang/sk_users_list.lng b/interface/web/admin/lib/lang/sk_users_list.lng index 5c3a17428a..239645f5e9 100644 --- a/interface/web/admin/lib/lang/sk_users_list.lng +++ b/interface/web/admin/lib/lang/sk_users_list.lng @@ -1,9 +1,8 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> diff --git a/interface/web/admin/lib/lang/tr_users_list.lng b/interface/web/admin/lib/lang/tr_users_list.lng index 8d1e03850e..052d28fa3b 100644 --- a/interface/web/admin/lib/lang/tr_users_list.lng +++ b/interface/web/admin/lib/lang/tr_users_list.lng @@ -1,9 +1,8 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> diff --git a/interface/web/admin/list/users.list.php b/interface/web/admin/list/users.list.php index 0cb2583642..bde04250f5 100644 --- a/interface/web/admin/list/users.list.php +++ b/interface/web/admin/list/users.list.php @@ -44,28 +44,26 @@ $liste['auth'] = 'no'; * Suchfelder *****************************************************/ -$liste['item'][] = array( 'field' => 'username', - 'datatype' => 'VARCHAR', - 'op' => 'like', - 'prefix' => '%', - 'suffix' => '%', - 'width' => ''); +$liste["item"][] = array( 'field' => "client_id", + 'datatype' => "INTEGER", + 'formtype' => "TEXT", + 'op' => "=", + 'prefix' => "", + 'suffix' => "", + 'width' => "", + 'value' => ""); + +$liste["item"][] = array( 'field' => "active", + 'datatype' => "VARCHAR", + 'formtype' => "SELECT", + 'op' => "=", + 'prefix' => "", + 'suffix' => "", + 'width' => "", + 'value' => array('1' => "
Yes
",'0' => "
No
")); -$liste['item'][] = array( 'field' => 'vorname', - 'datatype' => 'VARCHAR', - 'op' => 'like', - 'prefix' => '%', - 'suffix' => '%', - 'width' => ''); - -$liste['item'][] = array( 'field' => 'name', - 'datatype' => 'VARCHAR', - 'op' => 'like', - 'prefix' => '%', - 'suffix' => '%', - 'width' => ''); -$liste['item'][] = array( 'field' => 'ort', +$liste['item'][] = array( 'field' => 'username', 'datatype' => 'VARCHAR', 'op' => 'like', 'prefix' => '%', diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm index 0affa7e24f..59d88f0b78 100644 --- a/interface/web/admin/templates/users_list.htm +++ b/interface/web/admin/templates/users_list.htm @@ -19,27 +19,24 @@ + + - - - + + - - - + + - - -
{tmpl_var name='search_limit'}
{tmpl_var name="client_id"}{tmpl_var name="active"} {tmpl_var name="username"}{tmpl_var name="vorname"}{tmpl_var name="name"}{tmpl_var name="ort"}
{tmpl_var name='login_as_txt'} -- GitLab