pull from master 23.5.2018

2018-05-23 09:36:49 +06:30
parent f1733d9f06
commit dbfc00435b
12 changed files with 89 additions and 62 deletions
--- a/app/controllers/settings/employees_controller.rb
+++ b/app/controllers/settings/employees_controller.rb
@@ -68,6 +68,6 @@ class Settings::EmployeesController < ApplicationController

    # Never trust parameters from the scary internet, only allow the white list through.
    def employee_params
-      params.require(:employee).permit(:name, :role, :emp_id, :password, :image_path)
+      params.require(:employee).permit(:name, :role, :is_active, :emp_id, :password, :image_path)
    end
 end