glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix 2 bugs on develop (#565)

Browse source 
* fix js bug

* if mappable is nil it causes an error
This commit is contained in:
Devin Howard 2016-07-02 16:32:02 +08:00 committed by GitHub
parent 872ae90832
commit 27942546b8
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/src/Metamaps.Import.js
View file

@ -320,5 +320,3 @@ Metamaps.Import = {
Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, true) Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, true)
} }
} }
module.exports = Metamaps.Import

13
app/assets/javascripts/test/Metamaps.Import.spec.js
View file

@ -1,11 +1,12 @@
var chai = require('chai') /* global describe, it */
var expect = chai.expect const chai = require('chai')
const expect = chai.expect
Metamaps = {} const Metamaps = {}
Metamaps.Import = require('../src/Metamaps.Import') require('../src/Metamaps.Import')
describe('Metamaps.Import.js', function() { describe('Metamaps.Import.js', function () {
it('has a topic whitelist', function() { it('has a topic whitelist', function () {
expect(Metamaps.Import.topicWhitelist).to.deep.equal( expect(Metamaps.Import.topicWhitelist).to.deep.equal(
['id', 'name', 'metacode', 'x', 'y', 'description', 'link', 'permission'] ['id', 'name', 'metacode', 'x', 'y', 'description', 'link', 'permission']
) )

2
app/policies/mapping_policy.rb
View file

@ -16,7 +16,7 @@ class MappingPolicy < ApplicationPolicy
end end
def show? def show?
map_policy.show? && mappable_policy.show? map_policy.show? && mappable_policy.try(:show?)
end end
def create? def create?