diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 530bf0f..2548ddf 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,83 +1,10 @@ class UsersController < ApplicationController - - # GET /users/1 - # GET /users/1.json - def show - @user = User.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.json { render json: @user } - end - end - - # GET /users/new - # GET /users/new.json - def new - @user = User.new - - respond_to do |format| - format.html # new.html.erb - format.json { render json: @user } - end - end - - # GET /users/1/edit - def edit - @user = User.find(params[:id]) - end - - # POST /users - # POST /users.json - def create - @user = User.new(params[:user]) - - respond_to do |format| - if @user.save - format.html { redirect_to @user, notice: I18n.t('admin.user_created') } - format.json { render json: @user, status: :created, location: @user } - else - format.html { render action: "new" } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end - - # PUT /users/1 - # PUT /users/1.json - def update - @user = User.find(params[:id]) - - respond_to do |format| - if @user.update_attributes(params[:user]) - format.html { redirect_to({:controller=> "projects", :action => "new"}, {:notice => I18n.t('helpers.project.create_success') }) } - format.json { head :no_content } - else - format.html { render action: "edit" } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end - - - # DELETE /users/1 - # DELETE /users/1.json - def destroy - @user = User.find(params[:id]) - @user.destroy - - respond_to do |format| - format.html { redirect_to users_url } - format.json { head :no_content } - end - end def admin_index authorize User @users = current_user.organisation.users.includes(:roles, :project_groups) respond_to do |format| format.html # index.html.erb - format.json { render json: @organisation_users } end end @@ -113,7 +40,6 @@ @user.save! respond_to do |format| format.html { redirect_to({controller: 'users', action: 'admin_index'}, {notice: I18n.t('helpers.success')})} - format.json { head :no_content } end end diff --git a/config/routes.rb b/config/routes.rb index 1d59a2b..74cf8d5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -162,7 +162,6 @@ resources :project_partners resources :project_groups - resources :users resources :user_statuses resources :user_types