Skip to content

NetCommonsHtmlヘルパーを使うように修正 #415

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

Merged
merged 3 commits into from
Apr 18, 2017
Merged

NetCommonsHtmlヘルパーを使うように修正 #415

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
e88fbbc
NetCommonsHtmlヘルパーを使うように修正
s-nakajima Apr 18, 2017
257945d
phpunitエラー修正
s-nakajima Apr 18, 2017
bafbe0f
phpmdエラー修正
s-nakajima Apr 18, 2017
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
17 changes: 16 additions & 1 deletion Test/Case/Config/RoutesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public function setUp() {
* - exception ExceptionError文字列(省略可)
*
* @return array テストデータ
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function dataProvider() {
return array(
Expand All @@ -80,6 +81,8 @@ public function dataProvider() {
'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index',
'pass' => array('test4'),
'pagePermalink' => array('test4'),
'spacePermalink' => '',
'spaceId' => '2',
)
),
array('url' => '/test_pages/test_page/index',
Expand All @@ -97,13 +100,17 @@ public function dataProvider() {
'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index',
'pass' => array('test_err', 'test_error'),
'pagePermalink' => array('test_err', 'test_error'),
'spacePermalink' => '',
'spaceId' => '2',
)
),
array('url' => '/test_err/test_error/index',
'expected' => array(
'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index',
'pass' => array('test_err', 'test_error', 'index'),
'pagePermalink' => array('test_err', 'test_error', 'index'),
'spacePermalink' => '',
'spaceId' => '2',
)
),
array('url' => '/aaaaa/',
Expand All @@ -116,6 +123,8 @@ public function dataProvider() {
'expected' => array(
'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index',
'pagePermalink' => array(),
'spacePermalink' => '',
'spaceId' => '2',
),
'settingMode' => true
),
Expand All @@ -124,6 +133,8 @@ public function dataProvider() {
'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index',
'pass' => array('test4'),
'pagePermalink' => array('test4'),
'spacePermalink' => '',
'spaceId' => '2',
),
'settingMode' => true
),
Expand All @@ -146,14 +157,18 @@ public function dataProvider() {
'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index',
'pass' => array('test_err', 'test_error'),
'pagePermalink' => array('test_err', 'test_error'),
'spacePermalink' => '',
'spaceId' => '2',
),
'settingMode' => true
),
array('url' => '/setting/test_err/test_error/index',
'expected' => array(
'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index',
'pass' => array('test_err', 'test_error', 'index'),
'pagePermalink' => array('test_err', 'test_error', 'index')
'pagePermalink' => array('test_err', 'test_error', 'index'),
'spacePermalink' => '',
'spaceId' => '2',
),
'settingMode' => true
),
Expand Down
2 changes: 1 addition & 1 deletion Test/Case/Utility/CurrentFrame/SetFrameTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ private function __assertFrameMain($mergeExpected = array(), $removeKeys = array
'after_user_save_model' => null,
),
'BoxesPageContainer' => array(
'id' => '58',
'id' => '50',
'page_container_id' => '8',
'page_id' => '2',
'container_type' => '3',
Expand Down
4 changes: 2 additions & 2 deletions View/Elements/common_css.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @license http://www.netcommons.org/license.txt NetCommons License
*/

echo $this->Html->css(
echo $this->NetCommonsHtml->css(
array(
'/components/bootstrap/dist/css/bootstrap.min.css',
'/components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css',
Expand All @@ -21,5 +21,5 @@ echo $this->Html->css(
'/user_attributes/css/style.css',
'/wysiwyg/css/style.css',
),
array('plugin' => false)
array('plugin' => false, 'inline' => true, 'once' => false)
);
4 changes: 2 additions & 2 deletions View/Elements/common_js.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
* @license http://www.netcommons.org/license.txt NetCommons License
*/

echo $this->Html->script(
echo $this->NetCommonsHtml->script(
array(
'/components/jquery/dist/jquery.min.js',
'/components/bootstrap/dist/js/bootstrap.min.js',
'/components/angular/angular.min.js',
'/components/angular-bootstrap/ui-bootstrap-tpls.min.js',
'/net_commons/js/base.js',
),
array('plugin' => false)
array('plugin' => false, 'inline' => true, 'once' => false)
);
?>

Expand Down