Merge branch 'master' into lazyload-webpack-optimizations

.nvmrc

@@ -1 +1 @@
-6.9.2
+10.15.1

Gruntfile.js

@@ -7,8 +7,8 @@ var lockedDependencies = require('./lib/build/tasks/locked-dependencies.js');
 var webpackTask = null;
 var EDITOR_ASSETS_VERSION = require('./config/editor_assets_version.json').version;
 
-var REQUIRED_NODE_VERSIONS = ['10.x', '6.9.2'];
-var REQUIRED_NPM_VERSIONS = ['6.x', '3.10.9'];
+var REQUIRED_NODE_VERSIONS = ['10.x'];
+var REQUIRED_NPM_VERSIONS = ['6.x'];
 
 var DEVELOPMENT = 'development';
 

NEWS.md

@@ -27,6 +27,8 @@ Development
 - Fix "dataset not found" error in geocoding request for non-org users ([#2426](https://github.com/CartoDB/support/issues/2426))
 - Consider unlimited quotas when counting remaining maps ([#2163](https://github.com/CartoDB/support/issues/2163))
 - Validate email only on change ([#15575](https://github.com/CartoDB/cartodb/pull/15575))
+- Fix viewer user creation from UI ([#15580](https://github.com/CartoDB/cartodb/pull/15580))
+- Set node 10.15.1 as default and only for building assets, removing 6.9.2 ([#15530](https://github.com/CartoDB/cartodb/issues/15530))
 - Lazy loading of Dashboard routes ([#15581](https://github.com/CartoDB/cartodb/pull/15581))
 
 4.36.0 (2020-03-09)

app/models/carto/helpers/user_commons.rb

@@ -144,7 +144,7 @@ module Carto::UserCommons
   alias_method :has_organization?, :organization_user?
 
   def organization_owner?
-    organization&.owner_id == id
+    organization_user? && organization.owner_id == id
   end
 
   def organization_admin?

spec/models/user_part_refactored_behaviour_spec.rb

@@ -20,4 +20,4 @@ describe 'refactored behaviour' do
       FactoryGirl.build(:valid_user)
     end
   end
-end
+end

spec/models/user_shared_examples.rb

@@ -1150,4 +1150,14 @@ shared_examples_for "user models" do
       expect(@user.show_trial_reminder?).to be_false
     end
   end
+
+  describe '#organization_owner?' do
+    it 'returns false if the user does not have organization nor id' do
+      user = build_user
+      user.organization = nil
+      user.id = nil
+
+      expect(user.organization_owner?).to be_false
+    end
+  end
 end