maestrano-connector-rails 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe9997e4a9fafbf461eb15e54a2dc5d0fd39eeb76452cb33949145b3bc7a8f88
-  data.tar.gz: 771eae938809e8aeb51b0d9250ebf560b565b02b1b5c28e6de5d173e810c1a2b
+  metadata.gz: bfd22362e09c5e15198f2930ccf7d5e0b3341170b769a4efa2c625bb367d9dc4
+  data.tar.gz: f05895b4dbc9777176257d2e421f948da00c6267ab637d89d8e83472c00547da
 SHA512:
-  metadata.gz: c587dc91ddbf6f32455fcd0e2000dc91d5f5591a3490af4421ae964650705f7c1d78a4d74ed29a1d5f8be1d2e4a86c1fdea870493fcfb8ffadbdf4579d15bced
-  data.tar.gz: 87e3b05e86736f355859921020f5d4bf18140cf914d6896953614a5e83fb90b2ca5dc586d9f58ef55cfe395949ed0724ae40cf6da5575c93f0243cdd1ef62e08
+  metadata.gz: cec844572c51c895cce3e9a1621f79fc14105bc9ae1f55df2ad28e981b26425767bb74015aa657da4104425108a116ed48a24155fabcd00dbfcd65893d6ad107
+  data.tar.gz: dd8814f5f5d28112e4d44be1d0eb3d99a1969c8f9b05f13abcd3433c3fcf8f9b8c9b26bfc310e883dac97ff648590608f0162a99b2b3cebdde7539b1ed577566

data/app/controllers/maestrano/synchronizations_controller.rb

@@ -71,13 +71,12 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
     end
 
     def organization_status(organization)
-      last_sync = organization.synchronizations.last
       if Maestrano::Connector::Rails::SynchronizationJob.find_running_job(organization.id)
         'RUNNING'
       elsif Maestrano::Connector::Rails::SynchronizationJob.find_job(organization.id)
         'ENQUEUED'
       else
-        last_sync&.status || 'DISABLED'
+        organization.synchronizations.last&.status || 'DISABLED'
       end
     end
 end

data/app/controllers/version_controller.rb

@@ -5,7 +5,7 @@ class VersionController < ApplicationController
     commit = ENV['GIT_COMMIT_ID']
 
     respond_to do |format|
-      format.html { render text: "framework_version=#{framework_version}\nci_branch=#{branch}\nci_commit=#{commit}\nenv=#{Rails}\nnv, ruby_version=#{RUBY_VERSION}\nruby_engine=#{RUBY_ENGINE}\n" }
+      format.html { render text: "framework_version=#{framework_version}\nci_branch=#{branch}\nci_commit=#{commit}\nenv=#{Rails.env}\nruby_version=#{RUBY_VERSION}\nruby_engine=#{RUBY_ENGINE}\n" }
       format.json { render json: {framework_version: framework_version, ci_branch: branch, ci_commit: commit, env: Rails.env, ruby_version: RUBY_VERSION, ruby_engine: RUBY_ENGINE} }
     end
   end

data/app/models/maestrano/connector/rails/concerns/organization.rb

@@ -62,7 +62,7 @@ module Maestrano::Connector::Rails::Concerns::Organization
       entity_push_to_connec = clazz && clazz < Maestrano::Connector::Rails::Entity ? clazz.can_write_connec? : true
       entity_push_to_external = clazz && clazz < Maestrano::Connector::Rails::Entity ? clazz.can_write_external? : true
 
-      synchronized_entities[entity.to_sym] = {can_push_to_connec: !pull_disabled && entity_push_to_connec, can_push_to_external: !push_disabled && entity_push_to_external}
+      synchronized_entities[entity.to_sym] = {can_push_to_connec: entity_push_to_connec, can_push_to_external: entity_push_to_external}
     end
   end
 

data/lib/generators/connector/templates/home_index.haml

@@ -64,9 +64,9 @@
                 - current_organization.displayable_synchronized_entities.each do |k, v|
                   .row.sync-entity
                     .col-md-1.link-step-action
-                      #{check_box("#{k}", "to_connec", {checked: (v[:can_push_to_connec] || v[:can_push_to_external]) && !current_organization.pull_disabled, onclick: "return !#{k}_to_external.checked;", disabled: current_organization.pull_disabled || !v[:can_push_to_connec]})}
+                      #{check_box("#{k}", "to_connec", {checked: (v[:can_push_to_connec] || v[:can_push_to_external])})}
                     .col-md-1.link-step-action
-                      #{check_box("#{k}", "to_external", {checked: v[:can_push_to_external] && !current_organization.push_disabled, onchange: "#{k}_to_connec.checked = #{!current_organization.pull_disabled};", disabled: current_organization.push_disabled || !v[:can_push_to_external]})}
+                      #{check_box("#{k}", "to_external", {checked: v[:can_push_to_external], disabled: !v[:can_push_to_external]})}
                     %label.col-md-7{:for => "#{k}", style: 'padding-top: 5px;'}
                       .col-md-6
                         #{v[:external_name]}

data/lib/maestrano/connector/rails/version.rb

@@ -1,7 +1,7 @@
 module Maestrano
   module Connector
     module Rails
-      VERSION = '2.3.0'.freeze
+      VERSION = '2.3.1'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Maestrano