Merge remote-tracking branch 'refs/remotes/origin/arindam-bugg'

# Conflicts: # resources/lang/en/lang.php
2016-10-25 15:12:52 +05:30
parent c4fe4d5ea3 e5ca046a80
commit 60a46e6ff4
5 changed files with 108 additions and 42 deletions
--- a/app/Http/Controllers/Agent/helpdesk/UserController.php
+++ b/app/Http/Controllers/Agent/helpdesk/UserController.php
@@ -747,7 +747,8 @@ class UserController extends Controller
     */
    public function UserAssignOrg($id)
    {
-        $org = Input::get('org');
+        $org_name = Input::get('org');
+        $org = Organization::where('name', '=', $org_name)->lists('id')->first();
        $user_org = new User_org();
        $user_org->org_id = $org;
        $user_org->user_id = $id;