Merge pull request #20 from frywer/fix_api

api improvements
frywer · May 18, 2020 · e425c2a · e425c2a
2 parents 4923fd1 + fbae222
commit e425c2a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/app/controllers/custom_entities_controller.rb b/app/controllers/custom_entities_controller.rb
@@ -14,7 +14,7 @@ class CustomEntitiesController < ApplicationController
   include SortHelper
   helper :custom_tables_pdf
 
-  accept_api_auth :show
+  accept_api_auth :show, :create, :update, :destroy
 
   before_action :authorize_global
   before_action :find_custom_entity, only: [:show, :edit, :update, :add_belongs_to, :new_note]

diff --git a/app/helpers/custom_entities_helper.rb b/app/helpers/custom_entities_helper.rb
@@ -20,5 +20,7 @@ def render_api_custom_entity(custom_entity, api)
       next unless external_name.present?
       api.__send__(external_name, value)
     end
+    api.issue_id custom_entity.issue_id
+    api.custom_table_id custom_entity.custom_table_id
   end
 end
diff --git a/app/models/custom_entity.rb b/app/models/custom_entity.rb
@@ -8,7 +8,8 @@ class CustomEntity < ActiveRecord::Base
   has_one :project, through: :issue
   has_many :custom_fields, through: :custom_table
 
-  safe_attributes 'custom_table_id', 'author_id', 'custom_field_values', 'custom_fields', 'parent_entity_ids', 'sub_entity_ids', 'issue_id'
+  safe_attributes 'custom_table_id', 'author_id', 'custom_field_values', 'custom_fields', 'parent_entity_ids',
+                  'sub_entity_ids', 'issue_id', 'external_values'
 
   acts_as_customizable
 

diff --git a/app/views/custom_entities/show.api.rsb b/app/views/custom_entities/show.api.rsb
@@ -1,3 +1 @@
-api.__send__(@custom_entity.custom_table.name.downcase.singularize.gsub(/[^0-9A-Za-z]/, '_')) do
-  render_api_custom_entity @custom_entity, api
-end
+render_api_custom_entity @custom_entity, api
diff --git a/init.rb b/init.rb
@@ -2,7 +2,7 @@
   name 'Custom Tables plugin'
   author 'Ivan Marangoz'
   description 'This is a plugin for Redmine'
-  version '1.0.5'
+  version '1.0.6'
   requires_redmine :version_or_higher => '3.4.0'
   url 'https://github.com/frywer/custom_tables'
   author_url 'https://github.com/frywer'