Commit 6acaa2f6 authored by Till Brehm's avatar Till Brehm

Merge branch 'stable-3.1' into 'stable-3.1'

add "locked" to clients list

See merge request ispconfig/ispconfig3!761
parents 81aa9395 90eb0ef6
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Country';
$wb['add_new_record_txt'] = 'Add new client';
$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Държава';
$wb['add_new_record_txt'] = 'Добави нов клиент';
$wb['username_txt'] = 'Потребителско име';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'País';
$wb['add_new_record_txt'] = 'Adicionar novo cliente';
$wb['username_txt'] = 'Usuário';
$wb['customer_no_txt'] = 'Código do Cliente';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Pays';
$wb['add_new_record_txt'] = 'Ajouter un nouveau client';
$wb['username_txt'] = 'Nom d\'utilisateur';
$wb['customer_no_txt'] = 'Numéro client';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Stát';
$wb['add_new_record_txt'] = 'Vytvořit klienta';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['customer_no_txt'] = 'Zákaznické číslo';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Land';
$wb['add_new_record_txt'] = 'Kunden hinzufügen';
$wb['username_txt'] = 'Benutzername';
$wb['customer_no_txt'] = 'Kundennummer';
$wb['locked_txt'] = 'Gesperrt';
$wb['yes_txt'] = 'Ja';
$wb['no_txt'] = 'Nein';
?>
......@@ -8,4 +8,7 @@ $wb['city_txt'] = 'By';
$wb['country_txt'] = 'Land';
$wb['add_new_record_txt'] = 'Tilføj ny kunde';
$wb['customer_no_txt'] = 'Kunde Nr.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Χώρα';
$wb['add_new_record_txt'] = 'Νέος Πελάτης';
$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb["city_txt"] = 'City';
$wb["country_txt"] = 'Country';
$wb["add_new_record_txt"] = 'Add new client';
$wb["customer_no_txt"] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
\ No newline at end of file
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'País';
$wb['customer_no_txt'] = 'Cliente Nº.';
$wb['list_head_txt'] = 'Clientes';
$wb['username_txt'] = 'Nombre de usuario';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['client_id_txt'] = 'Tunnus';
$wb['add_new_record_txt'] = 'Add new client';
$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Pays';
$wb['add_new_record_txt'] = 'Ajouter un nouveau client';
$wb['username_txt'] = 'Nom d’utilisateur';
$wb['customer_no_txt'] = 'Numéro client';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Država';
$wb['add_new_record_txt'] = 'Dodaj klijenta';
$wb['username_txt'] = 'Korisničko ime';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Ország';
$wb['add_new_record_txt'] = 'Új Ügyfél hozzáadása';
$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Negara';
$wb['add_new_record_txt'] = 'Tambah Klien Baru';
$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Stato';
$wb['add_new_record_txt'] = 'Aggiungi nuovo cliente';
$wb['username_txt'] = 'Nome Utente';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = '国';
$wb['add_new_record_txt'] = 'クライアントを追加する';
$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Land';
$wb['add_new_record_txt'] = 'Toevoegen nieuwe klant';
$wb['username_txt'] = 'Gebruikersnaam';
$wb['customer_no_txt'] = 'Klantnummer';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Kraj';
$wb['add_new_record_txt'] = 'Dodaj nowego klienta';
$wb['username_txt'] = 'Login';
$wb['customer_no_txt'] = 'Nr klienta';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'País';
$wb['add_new_record_txt'] = 'Adicionar Cliente';
$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Tara';
$wb['add_new_record_txt'] = 'Adauga client nou';
$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['client_id_txt'] = 'ID Клиента';
$wb['add_new_record_txt'] = 'Добавить клиента';
$wb['username_txt'] = 'Логин';
$wb['customer_no_txt'] = 'Номер Клиента';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Land';
$wb['add_new_record_txt'] = 'Lägg till ny kund';
$wb['username_txt'] = 'Användarnamn';
$wb['customer_no_txt'] = 'Kundnummer';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['country_txt'] = 'Krajina';
$wb['add_new_record_txt'] = 'Pridať nového klienta';
$wb['username_txt'] = 'Username';
$wb['customer_no_txt'] = 'Customer No.';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -8,4 +8,7 @@ $wb['city_txt'] = 'İl';
$wb['country_txt'] = 'Ülke';
$wb['add_new_record_txt'] = 'Müşteri Ekle';
$wb['customer_no_txt'] = 'Müşteri No';
$wb['locked_txt'] = 'Locked';
$wb['yes_txt'] = 'Yes';
$wb['no_txt'] = 'No';
?>
......@@ -115,6 +115,15 @@ $liste["item"][] = array( 'field' => "country",
'width' => "",
'value' => "");
$liste["item"][] = array( 'field' => "locked",
'datatype' => "VARCHAR",
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
'suffix' => "",
'width' => "",
'value' => array('y' => $app->lng('yes_txt'), 'n' => $app->lng('no_txt')));
if(is_file(ISPC_WEB_PATH.'/robot/lib/robot_config.inc.php')){
$liste["item"][] = array( 'field' => "validation_status",
'datatype' => "VARCHAR",
......
......@@ -17,6 +17,7 @@
<thead class="dark form-group-sm">
<tr>
<th class="small-col" data-column="client_id"><tmpl_var name="client_id_txt"></th>
<th class="tiny-col" data-column="locked"><tmpl_var name="locked_txt"></th>
<th data-column="company_name"><tmpl_var name="company_name_txt"></th>
<th data-column="contact_name"><tmpl_var name="contact_name_txt"></th>
<th data-column="customer_no"><tmpl_var name="customer_no_txt"></th>
......@@ -28,6 +29,7 @@
</tr>
<tr>
<td><input class="form-control" type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
<td><select class="form-control locked-switch" name="search_locked">{tmpl_var name='search_locked'}</select></td>
<td><input class="form-control" type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
<td><input class="form-control" type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
<td><input class="form-control" type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" /></td>
......@@ -44,6 +46,7 @@
<tmpl_loop name="records">
<tr>
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="locked"}</a></td>
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="company_name"}</a></td>
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="contact_name"}</a></td>
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="customer_no"}</a></td>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment