DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5526 from tchak/add-revisions-step-4

Browse source 
Remove TypeDeChamp.to_stable_id
This commit is contained in:
Paul Chavard 2020-09-22 12:24:18 +02:00 committed by GitHub
commit 766981e7b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/new_administrateur/types_de_champ_controller.rb
View file

@ -15,7 +15,7 @@ module NewAdministrateur
end
def update
type_de_champ = @procedure.draft_revision.find_or_clone_type_de_champ(TypeDeChamp.to_stable_id(params[:id]))
type_de_champ = @procedure.draft_revision.find_or_clone_type_de_champ(params[:id])
if type_de_champ.update(type_de_champ_update_params)
reset_procedure
@ -26,13 +26,13 @@ module NewAdministrateur
end
def move
@procedure.draft_revision.move_type_de_champ(TypeDeChamp.to_stable_id(params[:id]), (params[:position] || params[:order_place]).to_i)
@procedure.draft_revision.move_type_de_champ(params[:id], (params[:position] || params[:order_place]).to_i)
head :no_content
end
def destroy
@procedure.draft_revision.remove_type_de_champ(TypeDeChamp.to_stable_id(params[:id]))
@procedure.draft_revision.remove_type_de_champ(params[:id])
reset_procedure
head :no_content
@ -67,7 +67,7 @@ module NewAdministrateur
end
def type_de_champ_create_params
type_de_champ_params = params.required(:type_de_champ).permit(:type_champ,
params.required(:type_de_champ).permit(:type_champ,
:libelle,
:description,
:mandatory,
@ -77,12 +77,6 @@ module NewAdministrateur
:piece_justificative_template,
:cadastres,
:mnhn)
if type_de_champ_params[:parent_id].present?
type_de_champ_params[:parent_id] = TypeDeChamp.to_stable_id(type_de_champ_params[:parent_id])
end
type_de_champ_params
end
def type_de_champ_update_params

17
app/models/type_de_champ.rb
View file

@ -17,8 +17,6 @@
# stable_id :bigint
#
class TypeDeChamp < ApplicationRecord
self.ignored_columns = ['procedure_id']
enum type_champs: {
text: 'text',
textarea: 'textarea',
@ -309,21 +307,6 @@ class TypeDeChamp < ApplicationRecord
end
end
# FIXME: We are changing how id is exposed to the editor.
# We used to expose type_de_champ.id as primary key to the editor. With revisions
# we need primary key to be type_de_champ.stable_id because any update can create
# a new version but we do not want editor to know about this.
# This is only needed for a clean migration without downtime. We want to ensure
# that if editor send a simple id because it was loaded before deployment
# we would still do the right thing.
def self.to_stable_id(id_or_stable_id)
if id_or_stable_id.to_s =~ /^stable:/
id_or_stable_id.to_s.gsub(/^stable:/, '')
else
id_or_stable_id
end
end
private
def parse_drop_down_list_value(value)