Actualizar plugin Additionals a 3.0.0

plugins/additionals/app/controllers/additionals_assign_to_me_controller.rb

@@ -23,7 +23,7 @@ class AdditionalsAssignToMeController < ApplicationController
     return redirect_to(issue_path(@issue)) if last_journal.nil?
 
     last_journal = @issue.journals.visible.order(:created_on).last
-    redirect_to "#{issue_path(@issue)}#change-#{last_journal.id}"
+    redirect_to "#{issue_path @issue}#change-#{last_journal.id}"
   end
 
   private

plugins/additionals/app/controllers/additionals_change_status_controller.rb

@@ -27,7 +27,7 @@ class AdditionalsChangeStatusController < ApplicationController
     return redirect_to(issue_path(@issue)) if last_journal.nil?
 
     last_journal = @issue.journals.visible.order(:created_on).last
-    redirect_to "#{issue_path(@issue)}#change-#{last_journal.id}"
+    redirect_to "#{issue_path @issue}#change-#{last_journal.id}"
   end
 
   private

plugins/additionals/app/controllers/dashboard_async_blocks_controller.rb

@@ -0,0 +1,96 @@
+require 'open-uri'
+
+class DashboardAsyncBlocksController < ApplicationController
+  before_action :find_dashboard
+  before_action :find_block
+
+  helper :additionals_routes
+  helper :additionals_queries
+  helper :additionals_tag
+  helper :queries
+  helper :issues
+  helper :activities
+  helper :dashboards
+
+  include DashboardsHelper
+
+  rescue_from Query::StatementInvalid, with: :query_statement_invalid
+  rescue_from StandardError, with: :dashboard_with_invalid_block
+
+  def show
+    @settings[:sort] = params[:sort] if params[:sort].present?
+    partial_locals = build_dashboard_partial_locals @block, @block_definition, @settings, @dashboard
+
+    respond_to do |format|
+      format.js do
+        render partial: partial_locals[:async][:partial],
+               content_type: 'text/html',
+               locals: partial_locals
+      end
+    end
+  end
+
+  # abuse create for query list sort order support
+  def create
+    return render_403 if params[:sort].blank?
+
+    partial_locals = build_dashboard_partial_locals @block, @block_definition, @settings, @dashboard
+    partial_locals[:sort_options] = { sort: params[:sort] }
+
+    respond_to do |format|
+      format.js do
+        render partial: 'update_order_by',
+               locals: partial_locals
+      end
+    end
+  end
+
+  private
+
+  def find_dashboard
+    @dashboard = Dashboard.find params[:dashboard_id]
+    raise ::Unauthorized unless @dashboard.visible?
+
+    if @dashboard.dashboard_type == DashboardContentProject::TYPE_NAME && @dashboard.project.nil?
+      @dashboard.content_project = find_project_by_project_id
+    else
+      @project = @dashboard.project
+      deny_access if @project.present? && !User.current.allowed_to?(:view_project, @project)
+    end
+
+    @can_edit = @dashboard&.editable?
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  def find_block
+    @block = params['block']
+    @block_definition = @dashboard.content.find_block @block
+
+    render_404 if @block.blank?
+    render_403 if @block_definition.blank?
+
+    @settings = @dashboard.layout_settings @block
+  end
+
+  def find_project_by_project_id
+    begin
+      @project = Project.find params[:project_id]
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+    deny_access unless User.current.allowed_to?(:view_project, @project)
+
+    @project
+  end
+
+  def dashboard_with_invalid_block(exception)
+    logger&.error "Invalid dashboard block for #{@block}: #{exception.message}"
+    respond_to do |format|
+      format.html do
+        render template: 'dashboards/block_error', layout: false
+      end
+      format.any { head @status }
+    end
+  end
+end

plugins/additionals/app/controllers/dashboards_controller.rb

@@ -0,0 +1,217 @@
+class DashboardsController < ApplicationController
+  menu_item :dashboards
+
+  before_action :find_dashboard, except: %i[index new create]
+  before_action :find_optional_project, only: %i[new create index]
+
+  accept_rss_auth :index, :show
+  accept_api_auth :index, :show, :create, :update, :destroy
+
+  rescue_from Query::StatementInvalid, with: :query_statement_invalid
+
+  helper :queries
+  helper :issues
+  helper :activities
+  helper :watchers
+  helper :additionals_routes
+  helper :dashboards
+  helper :additionals_issues
+  helper :additionals_queries
+  helper :additionals_tag
+
+  include AdditionalsRoutesHelper
+  include AdditionalsQueriesHelper
+  include QueriesHelper
+  include WatchersHelper
+  include SortHelper
+
+  def index
+    case params[:format]
+    when 'xml', 'json'
+      @offset, @limit = api_offset_and_limit
+    else
+      @limit = per_page_option
+    end
+
+    scope = Dashboard.visible
+    @query_count = scope.count
+    @query_pages = Paginator.new @query_count, @limit, params['page']
+    @dashboards = scope.sorted
+                       .limit(@limit)
+                       .offset(@offset)
+                       .to_a
+
+    respond_to do |format|
+      format.html { render_error status: 406 }
+      format.api
+    end
+  end
+
+  def show
+    respond_to do |format|
+      format.html { head 406 }
+      format.js if request.xhr?
+      format.api
+    end
+  end
+
+  def new
+    @dashboard = Dashboard.new(project: @project,
+                               author: User.current)
+    @dashboard.dashboard_type = assign_dashboard_type
+    @allowed_projects = @dashboard.allowed_target_projects
+  end
+
+  def create
+    @dashboard = Dashboard.new(author: User.current)
+    @dashboard.safe_attributes = params[:dashboard]
+    @dashboard.dashboard_type = assign_dashboard_type
+    @dashboard.role_ids = params[:dashboard][:role_ids] if params[:dashboard].present?
+
+    @allowed_projects = @dashboard.allowed_target_projects
+
+    if @dashboard.save
+      flash[:notice] = l(:notice_successful_create)
+
+      respond_to do |format|
+        format.html { redirect_to dashboard_link_path(@project, @dashboard) }
+        format.api  { render action: 'show', status: :created, location: dashboard_url(@dashboard, project_id: @project) }
+      end
+    else
+      respond_to do |format|
+        format.html { render action: 'new' }
+        format.api  { render_validation_errors(@dashboard) }
+      end
+    end
+  end
+
+  def edit
+    return render_403 unless @dashboard.editable_by?(User.current)
+
+    @allowed_projects = @dashboard.allowed_target_projects
+
+    respond_to do |format|
+      format.html
+      format.xml {}
+    end
+  end
+
+  def update
+    return render_403 unless @dashboard.editable_by?(User.current)
+
+    @dashboard.safe_attributes = params[:dashboard]
+    @dashboard.role_ids = params[:dashboard][:role_ids] if params[:dashboard].present?
+
+    @project = @dashboard.project if @project && @dashboard.project_id.present? && @dashboard.project != @project
+    @allowed_projects = @dashboard.allowed_target_projects
+
+    if @dashboard.save
+      flash[:notice] = l(:notice_successful_update)
+      respond_to do |format|
+        format.html { redirect_to dashboard_link_path @project, @dashboard }
+        format.api  { head :ok }
+      end
+    else
+      respond_to do |format|
+        format.html { render action: 'edit' }
+        format.api  { render_validation_errors @dashboard }
+      end
+    end
+  end
+
+  def destroy
+    return render_403 unless @dashboard.destroyable_by? User.current
+
+    begin
+      @dashboard.destroy
+      flash[:notice] = l(:notice_successful_delete)
+      respond_to do |format|
+        format.html { redirect_to @project.nil? ? home_path : project_path(@project) }
+        format.api  { head :ok }
+      end
+    rescue ActiveRecord::RecordNotDestroyed
+      flash[:error] = l(:error_remove_db_entry)
+      redirect_to dashboard_path(@dashboard)
+    end
+  end
+
+  def query_statement_invalid(exception)
+    logger&.error "Query::StatementInvalid: #{exception.message}"
+    session.delete(additionals_query_session_key('dashboard'))
+    render_error l(:error_query_statement_invalid)
+  end
+
+  def update_layout_setting
+    block_settings = params[:settings] || {}
+
+    block_settings.each do |block, settings|
+      @dashboard.update_block_settings(block, settings.to_unsafe_hash)
+    end
+    @dashboard.save
+    @updated_blocks = block_settings.keys
+  end
+
+  # The block is added on top of the page
+  # params[:block] : id of the block to add
+  def add_block
+    @block = params[:block]
+    if @dashboard.add_block @block
+      @dashboard.save
+      respond_to do |format|
+        format.html { redirect_to dashboard_link_path(@project, @dashboard) }
+        format.js
+      end
+    else
+      render_error status: 422
+    end
+  end
+
+  # params[:block] : id of the block to remove
+  def remove_block
+    @block = params[:block]
+    @dashboard.remove_block @block
+    @dashboard.save
+    respond_to do |format|
+      format.html { redirect_to dashboard_link_path(@project, @dashboard) }
+      format.js
+    end
+  end
+
+  # Change blocks order
+  # params[:group] : group to order (top, left or right)
+  # params[:blocks] : array of block ids of the group
+  def order_blocks
+    @dashboard.order_blocks params[:group], params[:blocks]
+    @dashboard.save
+    head 200
+  end
+
+  private
+
+  def assign_dashboard_type
+    if params['dashboard_type'].present?
+      params['dashboard_type']
+    elsif params['dashboard'].present? && params['dashboard']['dashboard_type'].present?
+      params['dashboard']['dashboard_type']
+    elsif @project.nil?
+      DashboardContentWelcome::TYPE_NAME
+    else
+      DashboardContentProject::TYPE_NAME
+    end
+  end
+
+  def find_dashboard
+    @dashboard = Dashboard.find(params[:id])
+    raise ::Unauthorized unless @dashboard.visible?
+
+    if @dashboard.dashboard_type == DashboardContentProject::TYPE_NAME && @dashboard.project.nil?
+      @dashboard.content_project = find_project_by_project_id
+    else
+      @project = @dashboard.project
+    end
+
+    @can_edit = @dashboard&.editable?
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end