diff --git a/app/controllers/results_controller.rb b/app/controllers/results_controller.rb index dde296aa8..97adbc3fb 100644 --- a/app/controllers/results_controller.rb +++ b/app/controllers/results_controller.rb @@ -4,7 +4,7 @@ class ResultsController < ApplicationController skip_before_action :verify_authenticity_token, only: %i(create destroy) before_action :load_my_module - before_action :load_vars, only: :destroy + before_action :load_vars, only: %i(destroy elements assets) before_action :check_destroy_permissions, only: :destroy def index @@ -32,6 +32,18 @@ class ResultsController < ApplicationController render json: result end + def elements + render json: @result.result_orderable_elements.order(:position), + each_serializer: ResultOrderableElementSerializer, + user: current_user + end + + def assets + render json: @result.assets, + each_serializer: AssetSerializer, + user: current_user + end + def destroy result_type = if @result.is_text t('activities.result_type.text') @@ -79,7 +91,7 @@ class ResultsController < ApplicationController end def load_vars - @result = Result.find_by_id(params[:id]) + @result = @my_module.results.find(params[:id]) return render_403 unless @result diff --git a/app/javascript/vue/results/results_toolbar.vue b/app/javascript/vue/results/results_toolbar.vue index 237bcc26b..05e5725a9 100644 --- a/app/javascript/vue/results/results_toolbar.vue +++ b/app/javascript/vue/results/results_toolbar.vue @@ -23,34 +23,9 @@ @@ -60,11 +35,23 @@