Skip to content
Snippets Groups Projects
Commit df4bb9c0 authored by Paal Joergensen's avatar Paal Joergensen
Browse files

Rename metadata to metadata_settings

parent 81ac9857
No related branches found
No related tags found
No related merge requests found
......@@ -120,7 +120,7 @@ class editor_framework implements \H5peditorStorage {
runnable,
restricted,
tutorial_url,
metadata
metadata_settings
FROM {hvp_libraries}
WHERE machine_name = ?
AND major_version = ?
......@@ -138,7 +138,7 @@ class editor_framework implements \H5peditorStorage {
$library->title = $details->title;
$library->runnable = $details->runnable;
$library->restricted = $superuser ? false : ($details->restricted === '1' ? true : false);
$library->metadata = $details->metadata;
$library->metadataSettings = json_decode($details->metadata_settings);
$librarieswithdetails[] = $library;
}
}
......@@ -153,11 +153,11 @@ class editor_framework implements \H5peditorStorage {
"SELECT id,
machine_name AS name,
title,
major_version,
minor_version,
tutorial_url,
major_version AS majorVersion,
minor_version AS minorVersion,
tutorial_url AS tutorialUrl,
restricted,
metadata
metadata_settings AS metadataSettings
FROM {hvp_libraries}
WHERE runnable = 1
AND semantics IS NOT NULL
......@@ -167,15 +167,11 @@ class editor_framework implements \H5peditorStorage {
// Remove unique index.
unset($library->id);
// Convert snakes to camels.
$library->majorVersion = (int) $library->major_version;
unset($library->major_version);
$library->minorVersion = (int) $library->minor_version;
unset($library->minor_version);
if (!empty($library->tutorial_url)) {
$library->tutorialUrl = $library->tutorial_url;
}
unset($library->tutorial_url);
$library->metadataSettings = json_decode($library->metadataSettings);
// Convert to int.
$library->majorVersion = (int) $library->majorVersion;
$library->minorVersion = (int) $library->minorVersion;
// Make sure we only display the newest version of a library.
foreach ($libraries as $key => $existinglibrary) {
......
......@@ -784,7 +784,7 @@ class framework implements \H5PFrameworkInterface {
'drop_library_css' => $droplibrarycss,
'semantics' => $librarydata['semantics'],
'has_icon' => $librarydata['hasIcon'],
'metadata' => $librarydata['metadata'] ? 1 : 0,
'metadata_settings' => $librarydata['metadataSettings'],
'add_to' => isset($librarydata['addTo']) ? json_encode($librarydata['addTo']) : null,
);
......
......@@ -89,7 +89,7 @@
<FIELD NAME="tutorial_url" TYPE="char" LENGTH="1000" NOTNULL="false" SEQUENCE="false" COMMENT="URL to a tutorial for this library"/>
<FIELD NAME="has_icon" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="Whether or not this library contains an icon.svg"/>
<FIELD NAME="add_to" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="Plugin configuration data"/>
<FIELD NAME="metadata" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false" COMMENT="Whether or not as sublibrary gets metadata button"/>
<FIELD NAME="metadata_settings" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="Metadata settings"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
......
......@@ -422,13 +422,13 @@ function hvp_upgrade_2018090300() {
$table = new xmldb_table('hvp_libraries');
if (!$dbman->field_exists($table, 'add_to')) {
$dbman->add_field($table,
new xmldb_field('add_to', XMLDB_TYPE_TEXT, null, null, null, null, null, 'has_icon')
new xmldb_field('add_to', XMLDB_TYPE_TEXT, null, null, null, null, null)
);
}
if (!$dbman->field_exists($table, 'metadata')) {
if (!$dbman->field_exists($table, 'metadata_settings')) {
$dbman->add_field($table,
new xmldb_field('metadata', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, '1', 'add_to')
new xmldb_field('metadata_settings', XMLDB_TYPE_TEXT, null, null, null, null, null)
);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment