Skip to content

Commit

Permalink
Merge pull request #223 from AntonShevchuk/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Anton authored and Anton committed Apr 2, 2015
2 parents 3899f29 + e856f15 commit b49e9a9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions application/modules/acl/controllers/user.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
/**
* @privilege Management
*
* @accept HTML
* @accept JSON
* @param int $id
* @return void
*/
Expand Down Expand Up @@ -49,6 +51,7 @@ function ($id) use ($view) {
// clean cache
Cache::delete('user:'.$user->id);
Messages::addSuccess('User roles was updated');
return false;
}

/* @var $view \Bluz\View\View */
Expand Down
2 changes: 1 addition & 1 deletion application/modules/acl/views/user.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @var \Application\Users\Row $user
*/
?>
<form class="form-horizontal ajax" method="post" action="<?=$this->url('acl', 'user', ['id'=>$user->id])?>" enctype="application/x-www-form-urlencoded">
<form action="<?=$this->url('acl', 'user', ['id'=>$user->id])?>" class="form-horizontal ajax" method="post" enctype="application/x-www-form-urlencoded">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title"><?=__('Choose roles for %s', $user->login)?></h3>
Expand Down
2 changes: 1 addition & 1 deletion application/modules/test/controllers/file.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function () {
Response::addHeader('Cache-Control', 'must-revalidate');
Response::addHeader('Pragma', 'public');

return function() {
return function () {
readfile(PATH_PUBLIC .'/img/loading.gif');
};
};

0 comments on commit b49e9a9

Please sign in to comment.