Skip to content

Commit

Permalink
Fixed issue #10792: correct date format, The date format which is use…
Browse files Browse the repository at this point in the history
…d in the bubble help in survey list is not formatted according to global settings
  • Loading branch information
LouisGac committed May 4, 2016
1 parent 009217e commit a08f92a
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions application/models/Survey.php
Expand Up @@ -712,6 +712,10 @@ public function getRunning()
$bExpired = ($oStop < $oNow);
$bWillRun = ($oStart > $oNow);

$dateformatdata=getDateFormatData(Yii::app()->session['dateformat']);
$sStop = $oStop->format($dateformatdata['phpdate']);
$sStart = $oStart->format($dateformatdata['phpdate']);

// Icon generaton (for CGridView)
$sIconRunning = '<a href="'.App()->createUrl('/admin/survey/sa/view/surveyid/'.$this->sid).'" class="survey-state" data-toggle="tooltip" title="'.gT('Expire').': '.$sStop.'"><span class="fa fa-clock-o text-success"></span></a>';
$sIconExpired = '<a href="'.App()->createUrl('/admin/survey/sa/view/surveyid/'.$this->sid).'" class="survey-state" data-toggle="tooltip" title="'.gT('Expired').': '.$sStop.'"><span class="fa fa fa-step-forward text-warning"></span></a>';
Expand Down

0 comments on commit a08f92a

Please sign in to comment.