Merge branch 'master' of https://github.com/af83/stif-boiv

4 files changed, 24 insertions, 7 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
index 377fd0612..1e569d584 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -57,6 +57,10 @@ class JourneyPattern extends Component{
     )
   }
 
+  isDisabled(action) {
+    return !this.props.status.policy[`journey_patterns.${action}`] && !this.props.editMode
+  }
+
   render() {
     this.previousCity = undefined
 
@@ -78,9 +82,10 @@ class JourneyPattern extends Component{
               <span className='fa fa-cog'></span>
             </div>
             <ul className='dropdown-menu'>
-              <li className={(this.props.status.policy['journey_patterns.update'] == false || this.props.editMode == false) ? 'disabled' : ''}>
+              <li className={this.isDisabled('update') ? 'disabled' : ''}>
                 <button
                   type='button'
+                  disabled={this.isDisabled('update')}
                   onClick={this.props.onOpenEditModal}
                   data-toggle='modal'
                   data-target='#JourneyPatternModal'
@@ -91,10 +96,10 @@ class JourneyPattern extends Component{
               <li className={this.props.value.object_id ? '' : 'disabled'}>
                 {this.vehicleJourneyURL(this.props.value.object_id)}
               </li>
-              <li className={'delete-action' + ((this.props.status.policy['journey_patterns.destroy'] == false || this.props.editMode == false) ? ' disabled' : '')}>
+              <li className={'delete-action' + (this.isDisabled('destroy') ? ' disabled' : '')}>
                 <button
                   type='button'
-                  disabled={(this.props.status.policy['journey_patterns.destroy'] == false || this.props.editMode == false)? 'disabled' : ''}
+                  disabled={this.isDisabled('destroy') ? 'disabled' : ''}
                   onClick={(e) => {
                     e.preventDefault()
                     this.props.onDeleteJourneyPattern(this.props.index)}
diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb
index be8b773e2..fc4322c76 100644
--- a/app/controllers/compliance_controls_controller.rb
+++ b/app/controllers/compliance_controls_controller.rb
@@ -7,9 +7,16 @@ class ComplianceControlsController < BreadcrumbController
   end
 
   def new
-    redirect_to(action: :select_type) unless params[:sti_class]
-    @compliance_control_set = parent
-    @compliance_control     = params[:sti_class].constantize.new
+    if params[:sti_class]
+      @compliance_control_set = parent
+      @compliance_control     = params[:sti_class].constantize.new
+    else
+      redirect_to(action: :select_type)
+    end
+  end
+
+  def create
+    create! { compliance_control_set_path(parent) }
   end
 
   private
diff --git a/app/models/compliance_check_message.rb b/app/models/compliance_check_message.rb
index 86899eb15..562c09c0e 100644
--- a/app/models/compliance_check_message.rb
+++ b/app/models/compliance_check_message.rb
@@ -1,4 +1,8 @@
 class ComplianceCheckMessage < ActiveRecord::Base
+  extend Enumerize
+
   belongs_to :compliance_check
   belongs_to :compliance_check_resource
+
+  enumerize :status, in: %i(OK ERROR WARNING IGNORED), scope: true
 end
diff --git a/app/models/compliance_check_resource.rb b/app/models/compliance_check_resource.rb
index a5c0c7d27..2989bf3cf 100644
--- a/app/models/compliance_check_resource.rb
+++ b/app/models/compliance_check_resource.rb
@@ -1,8 +1,9 @@
 class ComplianceCheckResource < ActiveRecord::Base
   extend Enumerize
+
   belongs_to :compliance_check_set
 
-  enumerize :status, in: %w[new successful warning failed]
+  enumerize :status, in: %i(OK ERROR WARNING IGNORED), scope: true
 
   validates_presence_of :compliance_check_set
 end