From 160aded3dfeae0ae60d27fcc9edd7d15c62adaad Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 2 Jun 2015 15:09:36 +0200 Subject: [PATCH] SONAR-6602 drop ruby code --- .../app/controllers/groups_controller.rb | 163 ------------------ .../app/views/groups/_create_form.html.erb | 34 ---- .../app/views/groups/_edit_form.html.erb | 34 ---- .../app/views/groups/_select_user.html.erb | 36 ---- 4 files changed, 267 deletions(-) delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_create_form.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_edit_form.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_select_user.html.erb diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb index 9ae565cc3e1..3c7c9873495 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb @@ -26,167 +26,4 @@ class GroupsController < ApplicationController end - def create_form - @group = Group.new - render :partial => 'groups/create_form' - end - - def edit_form - require_parameters :id - @group = Group.find(params[:id]) - render :partial => 'groups/edit_form' - end - - def create - verify_post_request - group = Group.new(params[:group]) - if group.save - flash[:notice] = 'The new group is created.' - render :text => 'ok', :status => 200 - else - @group = group - @errors = [] - group.errors.full_messages.each{|msg| @errors< 'groups/create_form', :status => 400 - end - end - - def update - verify_post_request - require_parameters :id - - @group = Group.find(params[:id]) - if @group.update_attributes(params[:group]) - flash[:notice] = 'Group is updated.' - render :text => 'ok', :status => 200 - else - @errors = [] - @group.errors.full_messages.each{|msg| @errors< 'groups/edit_form', :status => 400 - end - end - - def delete - verify_post_request - require_parameters :id - group = Group.find(params[:id]) - call_backend do - Internal.permission_templates.removeGroupFromTemplates(group.name) - if group.destroy - flash[:notice] = 'Group is deleted.' - end - end - to_index(group.errors, nil) - end - - # TO BE REMOVED ? - def select_user - @group = Group.find(params[:id]) - render :partial => 'groups/select_user' - end - - # TO BE REMOVED ? - def set_users - @group = Group.find(params[:id]) - if @group.set_users(params[:users]) - flash[:notice] = 'Group is updated.' - end - - redirect_to(:action => 'index') - end - - - # Used for selection of group members - # - # GET /groups/search_users?group=&page=1&pageSize=10 - # - # - def search_users - require_parameters :group, :page, :pageSize - - group = Group.first(:conditions => {:name => params[:group]}) - group_id = group.id - selected = params[:selected]||'all' - query = params[:query] - page_id = params[:page].to_i - page_size = [params[:pageSize].to_i, 1000].min - - conditions = ['users.active=?'] - condition_values = [true] - if selected=='selected' - conditions << "groups_users.group_id=?" - condition_values << group_id - elsif selected=='deselected' - conditions << "groups_users.group_id is null" - end - if query - conditions << "users.name like ?" - condition_values << "%#{query}%" - end - - users = User.find(:all, - :select => 'users.id,users.name,users.login,groups_users.group_id', - :joins => "left join groups_users on users.id=groups_users.user_id and groups_users.group_id=#{group_id}", - :conditions => [conditions.join(' and ')].concat(condition_values), - :offset => (page_id-1) * page_size, - :limit => page_size + 1, - :order => 'users.name') - - more = false - if users.size>page_size - users = users[0...page_size] - more = true - end - - respond_to do |format| - format.json { - render :json => { - :more => more, - :results => users.map {|user| {:id => user.id, :name => user.name, :login => user.login, :selected => (user.group_id != nil)}} - } - } - end - end - - def add_member - verify_post_request - require_parameters :group, :user - - user = User.find(:first, :conditions => {:login => params[:user], :active => true}) - group = Group.first(:conditions => {:name => params[:group]}) - status = 400 - if user && group - group.users << user - status = 200 if group.save - end - render :status => status, :text => '{}' - end - - def remove_member - verify_post_request - require_parameters :group, :user - - user = User.find(:first, :conditions => {:login => params[:user], :active => true}) - user_id = user.id - group = Group.first(:conditions => {:name => params[:group]}) - status = 400 - if group - user_from_group = group.users.find(user_id) - if user_from_group - group.users.delete(user_from_group) - status = 200 if group.save - else - status = 200 - end - end - render :status => status, :text => '{}' - end - - private - - def to_index(errors, id) - flash[:error] = errors.full_messages.join("
\n") unless errors.empty? - redirect_to(:action => 'index', :id => id) - end - end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_create_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_create_form.html.erb deleted file mode 100644 index 1e4036728b9..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_create_form.html.erb +++ /dev/null @@ -1,34 +0,0 @@ -<% form_for :group, @group, :url => { :action => 'create', :id => @group.id}, :html => { :id =>'group_form'} do |f| %> -
- - - - - -
-<% end %> - \ No newline at end of file diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_edit_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_edit_form.html.erb deleted file mode 100644 index cc649f85432..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_edit_form.html.erb +++ /dev/null @@ -1,34 +0,0 @@ -<% form_for :group, @group, :url => { :action => 'update', :id => @group.id}, :html => { :id =>'group_form'} do |f| %> -
- - - - - -
-<% end %> - diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_select_user.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_select_user.html.erb deleted file mode 100644 index edaa5ee2a55..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/_select_user.html.erb +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - -- 2.39.5