aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXinhui2018-01-04 14:22:45 +0100
committerXinhui2018-01-04 14:22:45 +0100
commitad537be88672bc6472925685e3e204ef562ad8c9 (patch)
tree0bd49aa8b1a63da1adb86fabff2918529200837c
parent346fa48d81aa9696bf2c3c8341d4d41c216889a7 (diff)
downloadchouette-core-ad537be88672bc6472925685e3e204ef562ad8c9.tar.bz2
Display checksum for journey patterns -m Refs
-rw-r--r--app/javascript/journey_patterns/actions/index.js3
-rw-r--r--app/javascript/journey_patterns/components/EditModal.js13
-rw-r--r--app/models/chouette/journey_pattern.rb3
-rw-r--r--app/views/api/v1/journey_patterns/show.rabl2
4 files changed, 16 insertions, 5 deletions
diff --git a/app/javascript/journey_patterns/actions/index.js b/app/javascript/journey_patterns/actions/index.js
index 4ff3f77ea..1c2eb68b2 100644
--- a/app/javascript/journey_patterns/actions/index.js
+++ b/app/javascript/journey_patterns/actions/index.js
@@ -198,6 +198,7 @@ const actions = {
name: val.name,
object_id: val.object_id,
short_id: val.short_id,
+ checksum: val.checksum,
published_name: val.published_name,
registration_number: val.registration_number,
stop_points: val.route_short_description.stop_points,
@@ -217,4 +218,4 @@ const actions = {
}
}
-export default actions \ No newline at end of file
+export default actions
diff --git a/app/javascript/journey_patterns/components/EditModal.js b/app/javascript/journey_patterns/components/EditModal.js
index e7ce24aa1..29154da3c 100644
--- a/app/javascript/journey_patterns/components/EditModal.js
+++ b/app/javascript/journey_patterns/components/EditModal.js
@@ -36,10 +36,19 @@ export default class EditModal extends Component {
{this.renderModalTitle()}
<span type="button" className="close modal-close" data-dismiss="modal">&times;</span>
</div>
-
{(this.props.modal.type == 'edit') && (
<form>
<div className='modal-body'>
+ <div>
+ <label className='control-label'>Signature métier</label>
+ <input
+ type='text'
+ ref='checksum'
+ className='form-control'
+ disabled='disabled'
+ defaultValue={this.props.modal.modalProps.journeyPattern.checksum}
+ />
+ </div>
<div className='form-group'>
<label className='control-label is-required'>Nom</label>
<input
@@ -121,4 +130,4 @@ EditModal.propTypes = {
modal: PropTypes.object,
onModalClose: PropTypes.func.isRequired,
saveModal: PropTypes.func.isRequired
-} \ No newline at end of file
+}
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index a62da6353..367b00449 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -40,7 +40,8 @@ module Chouette
# Update attributes and stop_points associations
jp.update_attributes(state_permited_attributes(item)) unless item['new_record']
jp.state_stop_points_update(item) if !jp.errors.any? && jp.persisted?
- item['errors'] = jp.errors if jp.errors.any?
+ item['errors'] = jp.errors if jp.errors.any?
+ item['checksum'] = jp.checksum
end
if state.any? {|item| item['errors']}
diff --git a/app/views/api/v1/journey_patterns/show.rabl b/app/views/api/v1/journey_patterns/show.rabl
index 3ea1bb6ff..86876f3fb 100644
--- a/app/views/api/v1/journey_patterns/show.rabl
+++ b/app/views/api/v1/journey_patterns/show.rabl
@@ -1,7 +1,7 @@
object @journey_pattern
extends "api/v1/trident_objects/show"
-[:id, :name, :published_name, :registration_number, :comment].each do |attr|
+[:id, :name, :published_name, :registration_number, :comment, :checksum].each do |attr|
attributes attr, :unless => lambda { |m| m.send( attr).nil?}
end