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

update permission of topics and synapses as map perm changes, when defer_to_map

Browse source
This commit is contained in:
Connor Turland 2016-12-02 21:12:40 +00:00
parent 3c67f68d3b
commit b09a98184c
7 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/synapse.rb
View file

@ -36,11 +36,7 @@ class Synapse < ApplicationRecord
end end
end end
def calculated_permission
defer_to_map&.permission || permission
end
def as_json(_options = {}) def as_json(_options = {})
super(methods: [:user_name, :user_image, :calculated_permission, :collaborator_ids]) super(methods: [:user_name, :user_image, :collaborator_ids])
end end
end end

6
app/models/topic.rb
View file

@ -75,12 +75,8 @@ class Topic < ApplicationRecord
Pundit.policy_scope(user, maps).map(&:id) Pundit.policy_scope(user, maps).map(&:id)
end end
def calculated_permission
defer_to_map&.permission || permission
end
def as_json(options = {}) def as_json(options = {})
super(methods: [:user_name, :user_image, :calculated_permission, :collaborator_ids]) super(methods: [:user_name, :user_image, :collaborator_ids])
.merge(inmaps: inmaps(options[:user]), inmapsLinks: inmapsLinks(options[:user]), .merge(inmaps: inmaps(options[:user]), inmapsLinks: inmapsLinks(options[:user]),
map_count: map_count(options[:user]), synapse_count: synapse_count(options[:user])) map_count: map_count(options[:user]), synapse_count: synapse_count(options[:user]))
end end

3
frontend/src/Metamaps/DataModel/Synapse.js
View file

@ -38,7 +38,6 @@ const Synapse = Backbone.Model.extend({
newOptions.success = function(model, response, opt) { newOptions.success = function(model, response, opt) {
if (s) s(model, response, opt) if (s) s(model, response, opt)
model.set('calculated_permission', model.get('permission'))
model.trigger('saved') model.trigger('saved')
if (permBefore === 'private' && model.get('permission') !== 'private') { if (permBefore === 'private' && model.get('permission') !== 'private') {
@ -85,7 +84,7 @@ const Synapse = Backbone.Model.extend({
</li>` </li>`
}, },
authorizeToEdit: function(mapper) { authorizeToEdit: function(mapper) {
if (mapper && (this.get('calculated_permission') === 'commons' || this.get('collaborator_ids').includes(mapper.get('id')) || this.get('user_id') === mapper.get('id'))) return true if (mapper && (this.get('permission') === 'commons' || this.get('collaborator_ids').includes(mapper.get('id')) || this.get('user_id') === mapper.get('id'))) return true
else return false else return false
}, },
authorizePermissionChange: function(mapper) { authorizePermissionChange: function(mapper) {

3
frontend/src/Metamaps/DataModel/Topic.js
View file

@ -37,7 +37,6 @@ const Topic = Backbone.Model.extend({
newOptions.success = function(model, response, opt) { newOptions.success = function(model, response, opt) {
if (s) s(model, response, opt) if (s) s(model, response, opt)
model.set('calculated_permission', model.get('permission'))
model.trigger('saved') model.trigger('saved')
if (permBefore === 'private' && model.get('permission') !== 'private') { if (permBefore === 'private' && model.get('permission') !== 'private') {
@ -82,7 +81,7 @@ const Topic = Backbone.Model.extend({
authorizeToEdit: function(mapper) { authorizeToEdit: function(mapper) {
if (mapper && if (mapper &&
(this.get('user_id') === mapper.get('id') || (this.get('user_id') === mapper.get('id') ||
this.get('calculated_permission') === 'commons' || this.get('permission') === 'commons' ||
this.get('collaborator_ids').includes(mapper.get('id')))) { this.get('collaborator_ids').includes(mapper.get('id')))) {
return true return true
} else { } else {

3
frontend/src/Metamaps/Import.js
View file

@ -295,8 +295,7 @@ const Import = {
permission: topicPermision, permission: topicPermision,
defer_to_map_id: deferToMapId, defer_to_map_id: deferToMapId,
desc: desc || '', desc: desc || '',
link: link || '', link: link || ''
calculated_permission: Active.Map.get('permission')
}) })
DataModel.Topics.add(topic) DataModel.Topics.add(topic)

2
frontend/src/Metamaps/SynapseCard.js
View file

@ -174,7 +174,7 @@ const SynapseCard = {
add_perms_form: function(synapse) { add_perms_form: function(synapse) {
// permissions - if owner, also allow permission editing // permissions - if owner, also allow permission editing
$('#editSynLowerBar').append('<div class="mapPerm ' + synapse.get('calculated_permission').substring(0, 2) + '"></div>') $('#editSynLowerBar').append('<div class="mapPerm ' + synapse.get('permission').substring(0, 2) + '"></div>')
// ability to change permission // ability to change permission
var selectingPermission = false var selectingPermission = false

4
frontend/src/Metamaps/TopicCard.js
View file

@ -448,8 +448,8 @@ const TopicCard = {
nodeValues.inmaps += '<li class="hideExtra extraText"><a href="' + url + '">' + inmapsAr[i] + '</a></li>' nodeValues.inmaps += '<li class="hideExtra extraText"><a href="' + url + '">' + inmapsAr[i] + '</a></li>'
} }
} }
nodeValues.permission = topic.get('calculated_permission') nodeValues.permission = topic.get('permission')
nodeValues.mk_permission = topic.get('calculated_permission').substring(0, 2) nodeValues.mk_permission = topic.get('permission').substring(0, 2)
nodeValues.map_count = topic.get('map_count').toString() nodeValues.map_count = topic.get('map_count').toString()
nodeValues.synapse_count = topic.get('synapse_count').toString() nodeValues.synapse_count = topic.get('synapse_count').toString()
nodeValues.id = topic.isNew() ? topic.cid : topic.id nodeValues.id = topic.isNew() ? topic.cid : topic.id