Skip to content

Bugfix/cur 1202 change behavioural label in semantics #1204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pankshiks wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Bugfix/cur 1202 change behavioural label in semantics #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
807e596
files commit
pankshiks Jun 28, 2022
abb9fc6
Merge remote-tracking branch 'origin/develop' into develop
pankshiks Jul 11, 2022
0ab983a
change the semantics to update the behavioural keyword
pankshiks Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion H5P/laravel-h5p/src/LaravelH5p/Eloquents/H5pContent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

namespace Djoudi\LaravelH5p\Eloquents;

use Illuminate\Database\Eloquent\Model;
use id;
use Illuminate\Support\Facades\DB;
use App\Models\IndependentActivity;
use Illuminate\Database\Eloquent\Model;

class H5pContent extends Model
{
Expand Down Expand Up @@ -50,4 +52,9 @@ public function library()
return $this->belongsTo(H5pLibrary::class, 'library_id');
}

public function independentActivity()
{
return $this->hasOne(IndependentActivity::class, 'h5p_content_id', 'id');
}

}
1 change: 0 additions & 1 deletion H5P/laravel-h5p/src/LaravelH5p/Repositories/LaravelH5pRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,6 @@ public function updateContent($content, $contentMainId = NULL)
'filtered' => '',
'disable' => $content['disable']
));

if (!isset($content['id'])) {
// Insert new content
$data['created_at'] = $current_date;;
Expand Down
11 changes: 8 additions & 3 deletions app/Http/Controllers/Api/V1/H5pController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public function create(Request $request)

// Prepare form
$library = 0;

if ($request->get('machineName') && $request->get('majorVersion') && $request->get('minorVersion')) {
$library = $request->get('machineName') . ' ' . $request->get('majorVersion') . '.' . $request->get('minorVersion');
}
Expand Down Expand Up @@ -145,6 +146,7 @@ public function store(Request $request)
try {
if ($request->get('action') === 'create') {
$content['library'] = $core->libraryFromString($request->get('library'));

if (!$content['library']) {
throw new H5PException('Invalid library.');
}
Expand All @@ -161,6 +163,7 @@ public function store(Request $request)

$content['params'] = $request->get('parameters');
$params = json_decode($content['params']);

// $content['title'] = $params->metadata->title;

if ($params === NULL) {
Expand All @@ -169,7 +172,7 @@ public function store(Request $request)

$content['params'] = json_encode($params->params);
$content['metadata'] = $params->metadata;

// Trim title and check length
$trimmed_title = empty($content['metadata']->title) ? '' : trim($content['metadata']->title);
if ($trimmed_title === '') {
Expand All @@ -185,7 +188,7 @@ public function store(Request $request)

// Save new content
$content['id'] = $core->saveContent($content);

// for Brightcove Interactive Videos
if ($content['library']['machineName'] === 'H5P.BrightcoveInteractiveVideo') {
$brightCoveVideoData['brightcove_video_id'] = $params->params->interactiveVideo->video->brightcoveVideoID;
Expand Down Expand Up @@ -226,7 +229,7 @@ public function store(Request $request)
], 422);
}
}

if ($return_id) {
return response([
'success' => trans('laravel-h5p.content.created'),
Expand Down Expand Up @@ -499,6 +502,8 @@ public function update(Request $request, $id)
// Save new content
$core->saveContent($content);



// Move images and find all content dependencies
$editor->processParameters($content['id'], $content['library'], $params->params, $oldLibrary, $oldParams);

Expand Down
Loading