Skip to content

Commit

Permalink
Merge branch '2.05' of git://github.com/LimeSurvey/LimeSurvey into 2.05
Browse files Browse the repository at this point in the history
  • Loading branch information
@mennodekker
mennodekker committed Mar 28, 2013
2 parents 13f696f + 8910901 commit 5d27d71
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 19 deletions.
12 changes: 6 additions & 6 deletions application/helpers/qanda_helper.php
View file
Expand Up @@ -4634,7 +4634,7 @@ function do_array_yesnouncertain($ia)
$answer_t_content .= CHECKED;
}
// --> START NEW FEATURE - SAVE
$answer_t_content .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n</label>\n\t</td>\n"
$answer_t_content .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n\t</td>\n"
. "\t<td class=\"answer_cell_N answer-item radio-item\">\n"
. "<label class=\"hide read\" for=\"answer$myfname-N\">".$clang->gT('No')."</label>\n"
. "<input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-N\" value=\"N\" ";
Expand Down Expand Up @@ -4803,7 +4803,7 @@ function do_array_increasesamedecrease($ia)
$answer_body .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n"
. "\t</td>\n"
. "\t<td class=\"answer_cell_D answer-item radio-item\">\n"
. "<label class=\"hide read\" for=\"answer$myfname-D\">".$clang->gT('Decrease')."<label>\n"
. "<label class=\"hide read\" for=\"answer$myfname-D\">".$clang->gT('Decrease')."</label>\n"
. "\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-D\" value=\"D\" ";
// --> END NEW FEATURE - SAVE
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == 'D')
Expand All @@ -4820,7 +4820,7 @@ function do_array_increasesamedecrease($ia)
if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1)
{
$answer_body .= "\t<td class=\"answer-item radio-item noanswer-item\">\n"
. "<label class=\"hide read\" for=\"answer$myfname-\">".$clang->gT('No answer')."<label>\n"
. "<label class=\"hide read\" for=\"answer$myfname-\">".$clang->gT('No answer')."</label>\n"
. "\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-\" value=\"\" ";
if (!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == '')
{
Expand Down Expand Up @@ -5024,7 +5024,7 @@ function do_array($ia)
$answer .= CHECKED;
}
// --> START NEW FEATURE - SAVE
$answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n</label>\n\t</td>\n";
$answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n\t</td>\n";
// --> END NEW FEATURE - SAVE
}

Expand Down Expand Up @@ -6052,7 +6052,7 @@ function do_arraycolumns($ia)
// because I think $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] is always set (by save.php ??) !
// should remove the !isset part I think !!
}
$answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n</label>\n\t</td>\n";
$answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n\t</td>\n";
}
unset($trbc);
$answer .= "</tr>\n";
Expand Down Expand Up @@ -6500,7 +6500,7 @@ function do_array_dual($ia)
{
$answer .= "\t</colgroup>\n";
}
$answer .= "\t<col class=\"ddarrayseparator\"{$separatorwidth} />\n";
$answer .= "\t<col class=\"ddarrayseparator\" width=\"{$separatorwidth}%\" />\n";
if($ddprefix != '' || $ddsuffix != '')
{
$answer .= "\t<colgroup width=\"$cellwidth%\">\n";
Expand Down
10 changes: 2 additions & 8 deletions application/libraries/PluginManager/LimesurveyApi.php
View file
Expand Up @@ -13,13 +13,7 @@ class LimesurveyApi
*/
protected function getTableName(iPlugin $plugin, $tableName)
{
$parts = array(App()->getDb()->tablePrefix);
$parts[] = $plugin->getName();
$parts[] = $tableName;
if (!in_array(null, $parts))
{
return implode('_', $parts);
}
return App()->getDb()->tablePrefix . $plugin->getName() . "_$tableName";
}
/**
* Sets a flash message to be shown to the user.
Expand Down Expand Up @@ -73,7 +67,7 @@ public function newModel(iPlugin $plugin, $sTableName, $scenario = 'insert')
{
if (null !== $table = $this->getTableName($plugin, $sTableName))
{
return new PluginDynamic($sTableName, $scenario);
return new PluginDynamic($table, $scenario);
}
}

Expand Down
2 changes: 1 addition & 1 deletion application/libraries/PluginManager/PluginBase.php
View file
Expand Up @@ -98,7 +98,7 @@ public function getPluginSettings($getValues = true)

public static function getName()
{
return self::$name;
return static::$name;
}
/**
* Returns the plugin storage and takes care of
Expand Down
26 changes: 22 additions & 4 deletions application/models/PluginDynamic.php
View file
Expand Up @@ -7,16 +7,22 @@ class PluginDynamic extends LSActiveRecord
{
private static $_models = array();

private $_md; // meta data

protected $tableName;

/**
* @param string $scenario
* @param string $sTableName
*/
public function __construct($sTableName, $scenario = 'insert')
public function __construct($sTableName = null, $scenario = 'insert')
{
parent::__construct($scenario);
if (!isset($sTableName))
{
throw new Exception('sTableName missing.');
}
$this->tableName = $sTableName;
parent::__construct($scenario);
}

/**
Expand All @@ -31,7 +37,7 @@ public static function model($sTableName = null)
{
if (!isset(self::$_models[$sTableName]))
{
$model = self::$_models[$sTableName] = new PluginDynamic($sTableName);
$model = self::$_models[$sTableName] = new PluginDynamic($sTableName, null);
$model->_md = new CActiveRecordMetaData($model);
$model->attachBehaviors($model->behaviors());
}
Expand All @@ -43,9 +49,21 @@ public static function model($sTableName = null)
* Gets the tablename for the current model.
*/
public function tableName() {
parent::tableName();
return $this->tableName;
}

/**
* Override
* @return CActiveRecordMetaData the meta for this AR class.
*/
public function getMetaData()
{
if($this->_md!==null)
return $this->_md;
else
return $this->_md=self::model($this->tableName())->_md;

}

}

Expand Down

0 comments on commit 5d27d71

Please sign in to comment.