L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-29808' of git://github.com/timhunt/moodle

Browse Source 
Conflicts:
	question/type/upgrade.txt

There were already one just added upgrade.txt file so this ended
conflicting. Reviewed the contents, I've deleted the less detailed
note about pluginname, leaving the longer description added by Tim.

Ciao :-)
This commit is contained in:
Eloy Lafuente (stronk7)
2011-11-10 21:54:36 +01:00
parent 47c6991a8e 226b312472
commit d59df6582b
80 changed files with 1046 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/questiontypebase.php
+14 -18
View File
@@ -93,20 +93,6 @@ class question_type {
return $this->local_name();
}
/**
* Returns a list of other question types that this one requires in order to
* work. For example, the calculated question type is a subclass of the
* numerical question type, which is a subclass of the shortanswer question
* type; and the randomsamatch question type requires the shortanswer type
* to be installed.
*
* @return array any other question types that this one relies on. An empty
* array if none.
*/
public function requires_qtypes() {
return array();
}
/**
* @return bool override this to return false if this is not really a
* question type, for example the description question type is not
@@ -263,7 +249,11 @@ class question_type {
global $OUTPUT;
$heading = $this->get_heading(empty($question->id));
echo $OUTPUT->heading_with_help($heading, $this->name(), $this->plugin_name());
if (get_string_manager()->string_exists('pluginname_help', $this->plugin_name())) {
echo $OUTPUT->heading_with_help($heading, 'pluginname', $this->plugin_name());
} else {
echo $OUTPUT->heading_with_help($heading, $this->name(), $this->plugin_name());
}
$permissionstrs = array();
if (!empty($question->id)) {
@@ -297,11 +287,17 @@ class question_type {
*/
public function get_heading($adding = false) {
if ($adding) {
$action = 'adding';
$string = 'pluginnameadding';
$fallback = 'adding' . $this->name();
} else {
$action = 'editing';
$string = 'pluginnameediting';
$fallback = 'editing' . $this->name();
}
if (get_string_manager()->string_exists($string, $this->plugin_name())) {
return get_string($string, $this->plugin_name());
} else {
return get_string($fallback, $this->plugin_name());
}
return get_string($action . $this->name(), $this->plugin_name());
}
/**