may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Popravki pri prikazu dodeljenuh uporabnikov.

Browse Source
This commit is contained in:
Peter Hrvatin 2021-01-04 11:46:32 +01:00
parent 19f6569265
commit 573c5ce576
4 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
admin/survey/SurveyAdminSettings.php
View File

@ -8315,17 +8315,24 @@ class SurveyAdminSettings {
$managed_accounts_count = mysqli_num_rows($sql); $managed_accounts_count = mysqli_num_rows($sql);
echo '<p class="bold" style="padding-left:0px;">';
echo $lang['srv_users_add_assigned_max_1'].' <span class="red bold">'.$managed_accounts_limit.'</span> '.$lang['srv_users_add_assigned_max_2'];
// Manager na virtualkah ima omejitev koliko uporabnikov lahko pregleduje // Manager na virtualkah ima omejitev koliko uporabnikov lahko pregleduje
if($managed_accounts_count >= $managed_accounts_limit){ if($managed_accounts_count >= $managed_accounts_limit){
echo '<p class="bold red" style="padding-left:0px;">Dosegli ste maksimalno število uporabnikov v pregledu ('.$managed_accounts_count.'/'.$managed_accounts_limit.').</p>'; echo '<br /><br />';
echo $lang['srv_users_add_assigned_max_reached'];
echo '</p>';
return; return;
} }
elseif($managed_accounts_count > 0){ elseif($managed_accounts_count > 0){
echo '<p class="bold" style="padding-left:0px;">Trenutno imate pregled nad '.$managed_accounts_count.' od maksimalno '.$managed_accounts_limit.' računi.</p>'; echo '<br /><br />';
} echo $lang['srv_users_add_assigned_current'].' <span class="red bold">'.$managed_accounts_count.' '.$lang['of'].' '.$managed_accounts_limit.'</span>';
else{
echo '<p class="bold" style="padding-left:0px;">Pod pregled lahko dodate '.$managed_accounts_limit.' uporabniških računov.</p>';
} }
echo '</p>';
} }
echo '<div id="dodajanje">'; echo '<div id="dodajanje">';

37
admin/survey/script/dostop.js
View File

@ -282,22 +282,27 @@ $(document).ready(function () {
} }
if ($('#my_users_list').length > 0) { if ($('#my_users_list').length > 0) {
tabelaDataTables = $('#my_users_list').DataTable({ tabelaDataTables = $('#my_users_list').DataTable({
"ajax": { "ajax": {
"url": siteUrl+"admin/survey/ajax.php?t=dostop&a=my_users_list", "url": siteUrl+"admin/survey/ajax.php?t=dostop&a=my_users_list",
"type": "post" "type": "post"
}, },
serverSide: true, serverSide: true,
lengthMenu: [[50, 500, 1000, 5000, 10000], [50, 500, 1000, 5000, 10000]], lengthMenu: [[50, 500, 1000, 5000, 10000], [50, 500, 1000, 5000, 10000]],
dom: 'Blfrtip', dom: 'Blfrtip',
deferRender: true, deferRender: true,
select: true, select: true,
buttons: [ buttons: [
], ],
language: { language: {
"url": siteUrl+"admin/survey/script/datatables/Slovenian.json" "url": siteUrl+"admin/survey/script/datatables/Slovenian.json"
} },
}); fnInitComplete : function() {
if ($(this).find('tbody tr td').hasClass('dataTables_empty')) {
$(this).parent().parent().hide();
}
}
});
} }
if ($('#deleted_users_list').length > 0) { if ($('#deleted_users_list').length > 0) {

4
lang/1.php
View File

@ -6223,6 +6223,10 @@ $lang = array (
'srv_users_add_new' => 'Nov uporabnik', 'srv_users_add_new' => 'Nov uporabnik',
"srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span>', "srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span>',
'srv_users_add_assigned' => 'Dodajte pregled nad uporabniki', 'srv_users_add_assigned' => 'Dodajte pregled nad uporabniki',
'srv_users_add_assigned_current' => 'Trenutno dodeljenih dostopov:',
'srv_users_add_assigned_max_reached' => 'Dosegli ste maksimalno število uporabnikov v pregledu.',
'srv_users_add_assigned_max_1' => 'Dostop do vaše domene lahko dodelite največ',
'srv_users_add_assigned_max_2' => 'uporabnikom.',
"srv_users_add_assigned_title" => 'Ustvarite novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>', "srv_users_add_assigned_title" => 'Ustvarite novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
"srv_users_assigned_title" => 'Uporabniki nad katerimi imate pregled', "srv_users_assigned_title" => 'Uporabniki nad katerimi imate pregled',
'srv_uredniske_nastavitve' => 'Uredniške nastavitve', 'srv_uredniske_nastavitve' => 'Uredniške nastavitve',

6
lang/2.php
View File

@ -6112,7 +6112,11 @@ $lang = array (
'srv_users_add_new' => 'Add new user', 'srv_users_add_new' => 'Add new user',
"srv_users_add_new_title" => 'Create new user in the system<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span>', "srv_users_add_new_title" => 'Create new user in the system<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span>',
'srv_users_add_assigned' => 'Add assigned users', 'srv_users_add_assigned' => 'Add assigned users',
"srv_users_add_assigned_title" => 'Create new user you will have overview on<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span></span>', 'srv_users_add_assigned_current' => 'Number of assigned users:',
'srv_users_add_assigned_max_reached' => 'You have reached maximum number of assigned users.',
'srv_users_add_assigned_max_1' => 'You can assign access to your domain to maximum',
'srv_users_add_assigned_max_2' => 'users.',
"srv_users_add_assigned_title" => 'Create new user you will have overview on<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span></span>',
"srv_users_assigned_title" => 'Your assigned users', "srv_users_assigned_title" => 'Your assigned users',
'srv_uredniske_nastavitve' => 'Editor settings', 'srv_uredniske_nastavitve' => 'Editor settings',
'srv_q_inicialke' => 'Respondents should enter their initials', 'srv_q_inicialke' => 'Respondents should enter their initials',