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

Popravki napak zaradi preklopa na hash ankete

Browse Source
This commit is contained in:
pero1203 2021-10-04 11:49:21 +02:00
parent aace61b391
commit dee7fa766e
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/survey/SurveyAdminSettings.php
View File

@ -50,7 +50,8 @@ class SurveyAdminSettings {
if ((isset ($_REQUEST['anketa']) && $_REQUEST['anketa'] > 0) || (isset ($anketa) && $anketa > 0)) { if ((isset ($_REQUEST['anketa']) && $_REQUEST['anketa'] > 0) || (isset ($anketa) && $anketa > 0)) {
$this->anketa = (isset ($_REQUEST['anketa']) && $_REQUEST['anketa'] > 0) ? $_REQUEST['anketa'] : $anketa; $this->anketa = (isset ($_REQUEST['anketa']) && $_REQUEST['anketa'] > 0) ? $_REQUEST['anketa'] : $anketa;
} else { }
else {
// nekje se uporablja tudi brez IDja ankete!!! // nekje se uporablja tudi brez IDja ankete!!!
//die("SAS: SID missing!"); //die("SAS: SID missing!");
} }

2
admin/survey/classes/surveyData/class.SurveyDataDisplay.php
View File

@ -2726,7 +2726,7 @@ class SurveyDataDisplay{
if ($quick_view == false) { if ($quick_view == false) {
//echo '<input type="submit" value="Shrani" /> ';<a href="#" onclick="document.forms['myFormName'].submit(); return false;">...</a> //echo '<input type="submit" value="Shrani" /> ';<a href="#" onclick="document.forms['myFormName'].submit(); return false;">...</a>
echo '<span class="floatRight spaceLeft" ><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="document.forms[\'vnos\'].submit(); return false;"><span>' . $lang['save'] . '</span></a></div></span>'; echo '<span class="floatRight spaceLeft" ><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="document.forms[\'vnos\'].submit(); return false;"><span>' . $lang['save'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" ><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="../survey/index.php?anketa='.self::$sid.'&a='.A_COLLECT_DATA.'"><span>Nazaj na podatke</span></a></div></span>'; echo '<span class="floatRight spaceRight" ><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="../survey/index.php?anketa='.self::$sid.'&a='.A_COLLECT_DATA.'"><span>' . $lang['srv_back_to_data'] . '</span></a></div></span>';
#echo '</form>'."\n"; #echo '</form>'."\n";
} }

4
admin/survey/modules/mod_advanced_paradata/class.SurveyAdvancedParadataLog.php
View File

@ -19,7 +19,7 @@ class SurveyAdvancedParadataLog {
// Privatni construct, ki ga 1x poklice getInstance // Privatni construct, ki ga 1x poklice getInstance
private function __construct () { private function __construct () {
if(isset($_GET['m']) && $_GET['m'] == 'quick_edit') if((isset($_GET['m']) && $_GET['m'] == 'quick_edit') || (isset($_GET['t']) && $_GET['t'] == 'postprocess'))
return false; return false;
$anketa_hash = $_REQUEST['anketa']; $anketa_hash = $_REQUEST['anketa'];
@ -45,7 +45,7 @@ class SurveyAdvancedParadataLog {
// Vrne ce zbiramo napredne parapodatke // Vrne ce zbiramo napredne parapodatke
public function paradataEnabled(){ public function paradataEnabled(){
if(isset($_GET['m']) && $_GET['m'] == 'quick_edit') if((isset($_GET['m']) && $_GET['m'] == 'quick_edit') || (isset($_GET['t']) && $_GET['t'] == 'postprocess'))
return false; return false;
return $this->collectParadata; return $this->collectParadata;

1
lang/1.php
View File

@ -2206,6 +2206,7 @@ $lang = array (
"forma_alert_if" => "V anketi so dodani pogoji!", "forma_alert_if" => "V anketi so dodani pogoji!",
"srv_forma_send" => "Po&#353;lji", "srv_forma_send" => "Po&#353;lji",
"srv_glasovanje_naslov" => "", "srv_glasovanje_naslov" => "",
"srv_back_to_data" => "Nazaj na podatke",
"srv_omogoci" => "Omogo&#269;i", "srv_omogoci" => "Omogo&#269;i",
"srv_omogoceno" => "omogo&#269;ena", "srv_omogoceno" => "omogo&#269;ena",
"srv_onemogoceno" => "onemogo&#269;ena", "srv_onemogoceno" => "onemogo&#269;ena",

1
lang/2.php
View File

@ -2192,6 +2192,7 @@ $lang = array (
"forma_alert_if" => "This survey includes conditions!", "forma_alert_if" => "This survey includes conditions!",
"srv_forma_send" => "Send", "srv_forma_send" => "Send",
"srv_glasovanje_naslov" => "", "srv_glasovanje_naslov" => "",
"srv_back_to_data" => "Back to data",
"srv_omogoci" => "Enable.", "srv_omogoci" => "Enable.",
"srv_omogoceno" => "enabled", "srv_omogoceno" => "enabled",
"srv_onemogoceno" => "disabled", "srv_onemogoceno" => "disabled",

2
main/survey/app/Controllers/BodyController.php
View File

@ -1699,7 +1699,7 @@ class BodyController extends Controller
// Preverimo ce gre za prvo popravljanje podatkov in avtomatsko ustvarimo arhiv podatkov ce je potrebno // Preverimo ce gre za prvo popravljanje podatkov in avtomatsko ustvarimo arhiv podatkov ce je potrebno
//ob_flush(); // ZAKAJ JE TUKAJ TA FLUSH? KER POTEM NE DELA NAKNADNO UREJANJE CE IMA ANKETA LOOPE //ob_flush(); // ZAKAJ JE TUKAJ TA FLUSH? KER POTEM NE DELA NAKNADNO UREJANJE CE IMA ANKETA LOOPE
$sas = new SurveyAdminSettings(); $sas = new SurveyAdminSettings($action=0, $anketa=get('anketa'));
$sas->checkFirstDataChange(); $sas->checkFirstDataChange();
// Updatamo tracking (ker gre za editiranje odgovorov) // Updatamo tracking (ker gre za editiranje odgovorov)