From 253ceb4b48307b7afb5ebda4511db1921eb9dc5a Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Thu, 19 Feb 2015 19:03:22 -0500 Subject: [PATCH 1/5] added imagemagick to vagrantfile --- Vagrantfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index ce873fa4..dad6c7c7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -18,6 +18,9 @@ sudo apt-get install postgresql -y sudo apt-get install libpq-dev -y sudo apt-get install redis-server -y +# get imagemagick +sudo apt-get install imagemagick --fix-missing + # Install node ln -fs /usr/bin/nodejs /usr/bin/node From 4d311cb371fef61d636e58fac8765f2fc7e3b33a Mon Sep 17 00:00:00 2001 From: mix irving Date: Tue, 3 Mar 2015 23:15:44 +1300 Subject: [PATCH 2/5] add .reuby-version for rbenv support --- .ruby-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..ac2cdeba --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.1.3 From c17cc398809764b3fbcf12f7e979eabfffb10970 Mon Sep 17 00:00:00 2001 From: mix irving Date: Wed, 4 Mar 2015 11:27:37 +1300 Subject: [PATCH 3/5] extract email settings into ENV :scissors: fixes #405 --- config/environments/development.rb | 9 +++++---- config/environments/production.rb | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 50a7f79f..74431de7 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -25,10 +25,11 @@ Metamaps::Application.configure do config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = { - address: 'mail.metamaps.cc', - port: 587, - user_name: 'team@metamaps.cc', - password: 'RcxX+s:fht49UX', + address: ENV['SMTP_SERVER'], + port: ENV['SMTP_PORT'], + user_name: ENV['SMTP_USERNAME'], + password: ENV['SMTP_PASSWORD'], + #domain: ENV['SMTP_DOMAIN'] authentication: 'plain', enable_starttls_auto: true, openssl_verify_mode: 'none' } diff --git a/config/environments/production.rb b/config/environments/production.rb index eddb8e01..2186327f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -27,10 +27,11 @@ Metamaps::Application.configure do config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = { - address: 'mail.metamaps.cc', - port: 587, - user_name: 'team@metamaps.cc', - password: 'RcxX+s:fht49UX', + address: ENV['SMTP_SERVER'], + port: ENV['SMTP_PORT'], + user_name: ENV['SMTP_USERNAME'], + password: ENV['SMTP_PASSWORD'], + #domain: ENV['SMTP_DOMAIN'] authentication: 'plain', enable_starttls_auto: true, openssl_verify_mode: 'none' } From 499f6349e652ccf5e91900a57d1f55c8bc8fdf3f Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Tue, 28 Apr 2015 18:43:47 -0400 Subject: [PATCH 4/5] add ability for admin to delete any topics and synapses --- app/assets/javascripts/src/Metamaps.js | 4 ++-- app/models/synapse.rb | 6 +++--- app/models/topic.rb | 6 +++--- app/models/user.rb | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 37614179..2a378623 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -2776,7 +2776,7 @@ Metamaps.Control = { var node = Metamaps.Visualize.mGraph.graph.getNode(nodeid); var topic = node.getData('topic'); - var permToDelete = Metamaps.Active.Mapper.id === topic.get('user_id'); + var permToDelete = Metamaps.Active.Mapper.id === topic.get('user_id') || Metamaps.Active.Mapper.get('admin'); if (permToDelete) { var topicid = topic.id; var mapping = node.getData('mapping'); @@ -2945,7 +2945,7 @@ Metamaps.Control = { var synapse = edge.getData("synapses")[index]; var mapping = edge.getData("mappings")[index]; - var permToDelete = Metamaps.Active.Mapper.id === synapse.get('user_id'); + var permToDelete = Metamaps.Active.Mapper.id === synapse.get('user_id') || Metamaps.Active.Mapper.get('admin'); if (permToDelete) { if (edge.getData("synapses").length - 1 === 0) { Metamaps.Control.hideEdge(edge); diff --git a/app/models/synapse.rb b/app/models/synapse.rb index a1395648..bf3bdab2 100644 --- a/app/models/synapse.rb +++ b/app/models/synapse.rb @@ -41,10 +41,10 @@ class Synapse < ActiveRecord::Base end def authorize_to_delete(user) - if (self.user != user) - return false + if (self.user == user || user.admin) + return self end - return self + return false end # returns Boolean if user allowed to view Topic, Synapse, or Map diff --git a/app/models/topic.rb b/app/models/topic.rb index 7e5fff94..078c633e 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -112,10 +112,10 @@ class Topic < ActiveRecord::Base end def authorize_to_delete(user) - if (self.user != user) - return false + if (self.user == user || user.admin) + return self end - return self + return false end # returns Boolean if user allowed to view Topic, Synapse, or Map diff --git a/app/models/user.rb b/app/models/user.rb index 11062046..2e738134 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -45,7 +45,8 @@ class User < ActiveRecord::Base def as_json(options={}) { :id => self.id, :name => self.name, - :image => self.image.url(:sixtyfour) + :image => self.image.url(:sixtyfour), + :admin => self.admin } end From 3f5d2bd7f32dc569862d91102af4b283384f288f Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 9 May 2015 23:22:23 -0400 Subject: [PATCH 5/5] add gem install bundler to configure.sh --- configure.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.sh b/configure.sh index 74f4121a..13e18244 100755 --- a/configure.sh +++ b/configure.sh @@ -7,6 +7,7 @@ fi vagrant up # Bundle! +vagrant ssh --command "cd /vagrant; gem install bundler"; vagrant ssh --command "cd /vagrant; bundle install"; # copy the db config