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

Moje ankete direktoriji - popravek brisanja direktorija, dodana moznost dodajanja mape v root

Browse Source
This commit is contained in:
pero1203 2022-10-13 09:43:54 +02:00
parent 871b7be5a2
commit 4edbd7556f
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
admin/survey/classes/class.SurveyListFolders.php
View File

@ -163,6 +163,17 @@ class SurveyListFolders extends SurveyList{
echo '<div class="folder_item_title">'.$lang['srv_mySurvey_all_surveys'].'</div>'; echo '<div class="folder_item_title">'.$lang['srv_mySurvey_all_surveys'].'</div>';
echo '<span class="folder_item_child_count">'.$survey_count.'</span>'; echo '<span class="folder_item_child_count">'.$survey_count.'</span>';
// Urejanje folderja
// Tri pikice za prikaz urejanja folderja
echo ' <span class="faicon dots_ver dots_ver_folder" onClick="mySurvey_folder_show_edit(this);"></span>';
// Skrit div za urejanje folderja
echo ' <div class="folder_item_settings displayNone">';
echo ' <ul>';
echo ' <li onClick="mySurvey_folder_add_popup(\''.$folder_id.'\');">'.$lang['srv_mySurvey_create_subfolder'].'</li>';
echo ' </ul>';
echo ' </div>';
} }
else{ else{
echo '<li id="folder_item_'.$folder_id.'" class="folder_item '.$folder_open.' '.$folder_active.' mySurvey_draggable mySurvey_droppable" folder_id="'.$folder_id.'" onClick="mySurvey_folder_activate(\''.$folder_id.'\');">'; echo '<li id="folder_item_'.$folder_id.'" class="folder_item '.$folder_open.' '.$folder_active.' mySurvey_draggable mySurvey_droppable" folder_id="'.$folder_id.'" onClick="mySurvey_folder_activate(\''.$folder_id.'\');">';
@ -1071,7 +1082,7 @@ class SurveyListFolders extends SurveyList{
if($folder_id > 0){ if($folder_id > 0){
// Dobimo parent folderja // Dobimo parent folderja
$sqlParent = sisplet_query("SELECT parent FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'"); $sqlParent = sisplet_query("SELECT parent, active FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
$rowParent = mysqli_fetch_array($sqlParent); $rowParent = mysqli_fetch_array($sqlParent);
// Ce je parent root, pobrisemo ankete ki so bile znotraj folderja // Ce je parent root, pobrisemo ankete ki so bile znotraj folderja
@ -1081,16 +1092,21 @@ class SurveyListFolders extends SurveyList{
// Drugace jih prestavimo v parenta // Drugace jih prestavimo v parenta
else{ else{
$sql = sisplet_query("UPDATE srv_mysurvey_anketa SET folder='".$rowParent['parent']."' WHERE folder='".$folder_id."' AND usr_id='".$global_user_id."'"); $sql = sisplet_query("UPDATE srv_mysurvey_anketa SET folder='".$rowParent['parent']."' WHERE folder='".$folder_id."' AND usr_id='".$global_user_id."'");
// Ce je bil active, nastavimo parenta za active
if($rowParent['active'] == '1'){
$sql2 = sisplet_query("UPDATE srv_mysurvey_folder SET active='1' WHERE id='".$rowParent['parent']."' AND usr_id='".$global_user_id."'");
}
} }
// Nastavimo subfolderjem novega parenta // Nastavimo subfolderjem novega parenta
$sql = sisplet_query("UPDATE srv_mysurvey_folder SET parent='".$rowParent['parent']."' WHERE parent='".$folder_id."' AND usr_id='".$global_user_id."'"); $sql3 = sisplet_query("UPDATE srv_mysurvey_folder SET parent='".$rowParent['parent']."' WHERE parent='".$folder_id."' AND usr_id='".$global_user_id."'");
// Na koncu se pobrisemo prazen folder // Na koncu se pobrisemo prazen folder
$sql = sisplet_query("DELETE FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'"); $sql4 = sisplet_query("DELETE FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
// Rekurzivno pobrisemo vse poddirektorije z anketami - TODO!!!
} }
$this->getSurveys();
} }

2
admin/survey/script/surveyList.js
View File

@ -221,7 +221,7 @@ function mySurvey_folder_rename(folder_id){
// Pobrisemo obstojeci folder // Pobrisemo obstojeci folder
function mySurvey_folder_delete(folder_id){ function mySurvey_folder_delete(folder_id){
$("#left_content").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_delete', {folder_id: folder_id}); $("#survey_list").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_delete', {folder_id: folder_id});
} }