diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index b33a6751e..7d5598551 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -3553,6 +3553,9 @@ class SurveyAdmin elseif($_GET['m'] == 'all'){ $sas->allUsersList(); } + elseif($_GET['m'] == 'add'){ + $sas->dodeljeniUporabniki(); + } else { $sas->assignedUsersList(); } diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index d25358a08..63ec1908a 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -9093,6 +9093,9 @@ class SurveyAdminSettings { global $lang; global $global_user_id; + // Dodajanje uporabnikov + echo '
'; + // managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo if( !($admin_type == 1 || $admin_type == 0) ) return ''; @@ -9219,6 +9222,9 @@ class SurveyAdminSettings { echo '
'; echo ''; + echo ''; //.add_user + + } /** @@ -9272,16 +9278,6 @@ class SurveyAdminSettings { $sqlU = sisplet_query("SELECT name, surname, email FROM users WHERE id='".$global_user_id."'"); $rowU = mysqli_fetch_array($sqlU); - - // Dodajanje uporabnikov - echo '
'; - - // Manager ali admin lahko doda novega uporabnika pod pregled - $this->dodeljeniUporabniki(); - - echo '
'; - - // PREGLED NAD UPORABNIKI - TABELA echo '
'; diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index 5a5dd683d..49a281564 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -247,11 +247,17 @@ class SurveyList { if ($admin_type == 0) { echo '