Commit bdb6144b authored by Jorgen's avatar Jorgen

Fix some small issues

parent 48c06530
...@@ -97,6 +97,11 @@ class Authorization extends CI_Controller { ...@@ -97,6 +97,11 @@ class Authorization extends CI_Controller {
} else if ($user_info->type == 'user') { } else if ($user_info->type == 'user') {
redirect('users/typos/'); redirect('users/typos/');
} }
} else {
$this->error_login();
$this->data['error_message'] = "Аккаунт заблокирован";
$this->load->view($this->view_name, $this->data);
return;
} }
} else { } else {
$this->error_login(); $this->error_login();
......
...@@ -26,7 +26,7 @@ jQuery("#table_users").jqGrid({ // Привязка плагина к табли ...@@ -26,7 +26,7 @@ jQuery("#table_users").jqGrid({ // Привязка плагина к табли
{name:"firstname", index:"u.firstname", width:80, sortable:true, searchtype:"string", align:'center', editable:true, editrules:{required:true}}, {name:"firstname", index:"u.firstname", width:80, sortable:true, searchtype:"string", align:'center', editable:true, editrules:{required:true}},
{name:"middlename", index:"u.middlename", width:80, sortable:true, searchtype:"string", align:'center', editable:true, editrules:{required:true}}, {name:"middlename", index:"u.middlename", width:80, sortable:true, searchtype:"string", align:'center', editable:true, editrules:{required:true}},
{name:"lastname", index:"u.lastname", width:80, sortable:true, searchtype:"string", align:'center', editable:true, editrules:{required:true}}, {name:"lastname", index:"u.lastname", width:80, sortable:true, searchtype:"string", align:'center', editable:true, editrules:{required:true}},
{name:"activity", index:"u.activity", width:80, sortable:true, searchtype:"integer", align:'center', editable:true, edittype:"checkbox", editoptions: {value:"1:0", defaultValue:'0'}, formatter:'checkbox'}, {name:"activity", index:"u.activity", width:80, sortable:true, searchtype:"integer", align:'center', editable:true, edittype:"checkbox", editoptions: {value:"1:0", defaultValue:"1"}, formatter:'checkbox'},
{name:"date", index:"u.date", width:120, sortable:true, searchtype:"string", align:'center'}, {name:"date", index:"u.date", width:120, sortable:true, searchtype:"string", align:'center'},
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment