diff --git a/plugins/MTBlockEditor/lib/MT/Plugin/MTBlockEditor/App/CMS.pm b/plugins/MTBlockEditor/lib/MT/Plugin/MTBlockEditor/App/CMS.pm index 6afa9e5..3382cf3 100644 --- a/plugins/MTBlockEditor/lib/MT/Plugin/MTBlockEditor/App/CMS.pm +++ b/plugins/MTBlockEditor/lib/MT/Plugin/MTBlockEditor/App/CMS.pm @@ -10,7 +10,7 @@ use utf8; use MT::Util qw(encode_html); use Class::Method::Modifiers qw(install_modifier); -use MT::Plugin::MTBlockEditor qw(plugin blocks to_custom_block_types_json tmpl_param); +use MT::Plugin::MTBlockEditor qw(plugin translate blocks to_custom_block_types_json tmpl_param); my $Initialized; @@ -248,13 +248,18 @@ sub template_param_edit_content_type { my $blog = $app->blog; my $blog_id = $blog ? $blog->id : 0; - my $tmpl_param = tmpl_param(); - while (my ($k, $v) = each %$tmpl_param) { - $param->{$k} = $v; - } - $param->{mt_block_editor_configs} = [map { { id => $_->id, label => $_->label } } MT->model('be_config')->load({ blog_id => [0, $blog_id] })]; - - insert_after($tmpl, undef, 'mt_block_editor_edit_content_type.tmpl'); + my $tmpl_param = tmpl_param(); + my $mt_block_editor_configs = [map { { id => $_->id, label => $_->label } } MT->model('be_config')->load({ blog_id => [0, $blog_id] })]; + + $param->{js_include} .= qq{ + +}; } sub template_source_field_html_multi_line_text { diff --git a/plugins/MTBlockEditor/t/05-app-cms.t b/plugins/MTBlockEditor/t/05-app-cms.t index 475a0ac..a611951 100644 --- a/plugins/MTBlockEditor/t/05-app-cms.t +++ b/plugins/MTBlockEditor/t/05-app-cms.t @@ -89,6 +89,24 @@ subtest 'entry' => sub { like $out, qr{}; }; +subtest 'content_type' => sub { + $app = _run_app( + 'MT::App::CMS', + { + __test_user => $admin, + __request_method => 'GET', + __mode => 'view', + _type => 'content_type', + id => $content_type->id, + blog_id => $blog->id, + }); + $out = delete $app->{__test_output}; + + # loaded + like $out, qr{content-field/dist/index.js}; + like $out, qr{\s*$}; +}; + subtest 'content_data' => sub { $app = _run_app( 'MT::App::CMS', diff --git a/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl b/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl deleted file mode 100644 index f365f38..0000000 --- a/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl b/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl deleted file mode 100644 index f365f38..0000000 --- a/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl +++ /dev/null @@ -1,9 +0,0 @@ - - -