From 198febfd94226e0f9440bf7bf42982c53f88cb34 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Wed, 23 Nov 2016 13:19:10 +0100 Subject: [PATCH] Fix user projects not working --- app/controllers/user_projects_controller.rb | 5 +---- config/locales/en.yml | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/user_projects_controller.rb b/app/controllers/user_projects_controller.rb index 01846ce20..be3cbb54d 100644 --- a/app/controllers/user_projects_controller.rb +++ b/app/controllers/user_projects_controller.rb @@ -76,10 +76,7 @@ class UserProjectsController < ApplicationController format.json { render :json => { status: 'error', - error: error, - :errors => [ - flash_error - ] + error: error } } end diff --git a/config/locales/en.yml b/config/locales/en.yml index da625fd40..d2a5bed14 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -418,6 +418,8 @@ en: normal_user: "User" technician: "Technician" viewer: "Viewer" + edit: + update_role: "Change Role" create: select_user_role: "Please select a user role." add_user_generic_error: "An error occured. "