Skip to content
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.

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

#2792: Ошибка с регистром названий функций в новом меню #2793

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Версия 1.3 В разработке
-----------------------

- #2792: Ошибка с регистром названий функций в новом меню (@dzhedai)
- #2678: Удаление способа доставки и заказы (@tmsk70, @kuzmina-mariya)
- #2658: Еще баг с переключением языков (@tmsk70, @kuzmina-mariya)
- #1942: Исправления в комментариях (@chemezov, @kuzmina-mariya)
Expand Down
16 changes: 9 additions & 7 deletions protected/modules/menu/controllers/MenuitemBackendController.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,26 +256,28 @@ public function actionDynamicParent()
/**
* @throws CHttpException
*/
public function actionAjaxGetEntities()
public function actionGetentities()
{
$request = Yii::app()->getRequest();

if (!$entityModuleName = $request->getQuery('entity_module_name')) {
if (!$entityModuleName = $request->getParam('entity_module_name')) {
throw new CHttpException(404);
}

echo json_encode(Yii::app()->menu->getEntityList($entityModuleName));
Yii::app()->end();
}


/**
* @throws CHttpException
*/
public function actionAjaxGetEntityItems()
public function actionGetentityitems()
{

$request = Yii::app()->getRequest();

if (!($entityModuleName = $request->getQuery('entity_module_name')) || (!$entityName = $request->getQuery('entity_name'))) {
if (!($entityModuleName = $request->getParam('entity_module_name')) || (!$entityName = $request->getParam('entity_name'))) {
throw new CHttpException(404);
}

Expand All @@ -286,12 +288,12 @@ public function actionAjaxGetEntityItems()
/**
* @throws CHttpException
*/
public function actionAjaxGetEntityUrl()
public function actionGetentityurl()
{
$request = Yii::app()->getRequest();

if ((!$entityModuleName = $request->getQuery('entity_module_name')) ||
(!$entityName = $request->getQuery('entity_name')) || (!$entity_id = $request->getQuery('entity_id'))) {
if ((!$entityModuleName = $request->getParam('entity_module_name')) ||
(!$entityName = $request->getParam('entity_name')) || (!$entity_id = $request->getParam('entity_id'))) {
throw new CHttpException(404);
}

Expand Down
56 changes: 29 additions & 27 deletions protected/modules/menu/views/menuitemBackend/_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
<div class="modal-content">
<div class="modal-header">
<button class="close" type="button" data-dismiss="modal">×</button>
<h4 class="modal-title"><?= Yii::t('MenuModule.menu', 'Select link')?></h4>
<h4 class="modal-title"><?= Yii::t('MenuModule.menu', 'Select link') ?></h4>
</div>
<div class="modal-body container">

Expand Down Expand Up @@ -398,7 +398,8 @@
</div>
</div>
<div class="modal-footer">
<button class="btn btn-default" type="button" data-dismiss="modal"><?= Yii::t('MenuModule.menu', 'Close')?></button>
<button class="btn btn-default" type="button"
data-dismiss="modal"><?= Yii::t('MenuModule.menu', 'Close') ?></button>
</div>
</div>
</div>
Expand Down Expand Up @@ -441,46 +442,47 @@
$('#MenuItem_entity_name option').remove();
clearEntityIdSelect();

$.ajax({
url: '<?= Yii::app()->createUrl('/menu/menuItemBackend/ajaxGetEntities') ?>',
method: 'GET',
data: {entity_module_name: $(this).val()},
success: function (data) {
$.post('<?= Yii::app()->createUrl('/menu/menuitemBackend/getentities/') ?>', {
'<?= Yii::app()->getRequest()->csrfTokenName;?>': '<?= Yii::app()->getRequest()->csrfToken;?>',
entity_module_name: $(this).val()
}, function (data) {
$('#MenuItem_entity_name').append($("<option></option>").attr("value", '').text('-- Не выбрано --'));
$.each($.parseJSON(data), function (key, value) {
$('#MenuItem_entity_name').append($("<option></option>").attr("value", key).text(value));
});
}
});
);
});


$('#MenuItem_entity_name').on('change', function () {
clearEntityIdSelect();

$.ajax({
url: '<?= Yii::app()->createUrl('/menu/menuItemBackend/ajaxGetEntityItems') ?>',
method: 'GET',
data: {entity_module_name: $('#MenuItem_entity_module_name').val(), entity_name: $(this).val()},
success: function (data) {
$.each($.parseJSON(data), function (key, value) {
$('#MenuItem_entity_id').append($("<option></option>").attr("value", key).text(value));
});
}
$.post('<?= Yii::app()->createUrl('/menu/menuitemBackend/getentityitems/') ?>', {
'<?= Yii::app()->getRequest()->csrfTokenName;?>': '<?= Yii::app()->getRequest()->csrfToken;?>',
entity_module_name: $('#MenuItem_entity_module_name').val(), entity_name: $(this).val()
}, function (data) {
$.each($.parseJSON(data), function (key, value) {
$('#MenuItem_entity_id').append($("<option></option>").attr("value", key).text(value));
});
});

});


$('#MenuItem_entity_id').on('select2-selecting', function (e) {
$.ajax({
url: '<?= Yii::app()->createUrl('/menu/menuItemBackend/ajaxGetEntityUrl') ?>',
method: 'GET',
data: {
entity_module_name: $('#MenuItem_entity_module_name').val(),
entity_name: $('#MenuItem_entity_name').val(),
entity_id: e.val
},
success: function (data) {

$.post('<?= Yii::app()->createUrl('/menu/menuitemBackend/getentityurl/') ?>', {
'<?= Yii::app()->getRequest()->csrfTokenName;?>': '<?= Yii::app()->getRequest()->csrfToken;?>',
entity_module_name: $('#MenuItem_entity_module_name').val(),
entity_name: $('#MenuItem_entity_name').val(),
entity_id: e.val

}, function (data) {
$('#MenuItem_href').val(data);
}
})
);


});
</script>