change the list

Gemfile.lock

@@ -300,6 +300,3 @@ DEPENDENCIES
   tunemygc
   uglifier
   uservoice-ruby
-
-BUNDLED WITH
-   1.11.2

app/assets/javascripts/src/Metamaps.Map.js.erb

@@ -64,6 +64,7 @@ Metamaps.Map = {
     var start = function (data) {
       Metamaps.Active.Map = new bb.Map(data.map)
       Metamaps.Mappers = new bb.MapperCollection(data.mappers)
+      Metamaps.Collaborators = new bb.MapperCollection(data.collaborators)
       Metamaps.Topics = new bb.TopicCollection(data.topics)
       Metamaps.Synapses = new bb.SynapseCollection(data.synapses)
       Metamaps.Mappings = new bb.MappingCollection(data.mappings)
@@ -477,15 +478,18 @@ Metamaps.Map.InfoBox = {
 
     var isCreator = map.authorizePermissionChange(Metamaps.Active.Mapper)
     var canEdit = map.authorizeToEdit(Metamaps.Active.Mapper)
+    var relevantPeople = map.get('permission') === 'commons' ? Metamaps.Mappers : Metamaps.Collaborators
     var shareable = map.get('permission') !== 'private'
 
     obj['name'] = canEdit ? Hogan.compile(self.nameHTML).render({id: map.id, name: map.get('name')}) : map.get('name')
     obj['desc'] = canEdit ? Hogan.compile(self.descHTML).render({id: map.id, desc: map.get('desc')}) : map.get('desc')
     obj['map_creator_tip'] = isCreator ? self.changePermissionText : ''
-    obj['contributors_class'] = Metamaps.Mappers.length > 1 ? 'multiple' : ''
+
-    obj['contributors_class'] += Metamaps.Mappers.length === 2 ? ' mTwo' : ''
+    obj['contributors_class'] = relevantPeople.length > 1 ? 'multiple' : ''
-    obj['contributor_image'] = Metamaps.Mappers.length > 0 ? Metamaps.Mappers.models[0].get('image') : "<%= asset_path('user.png') %>"
+    obj['contributors_class'] += relevantPeople.length === 2 ? ' mTwo' : ''
+    obj['contributor_image'] = relevantPeople.length > 0 ? relevantPeople.models[0].get('image') : "<%= asset_path('user.png') %>"
     obj['contributor_list'] = self.createContributorList()
+
     obj['user_name'] = isCreator ? 'You' : map.get('user_name')
     obj['created_at'] = map.get('created_at_clean')
     obj['updated_at'] = map.get('updated_at_clean')
@@ -562,11 +566,11 @@ Metamaps.Map.InfoBox = {
   },
   createContributorList: function () {
     var self = Metamaps.Map.InfoBox
-
+    var relevantPeople = Metamaps.Active.Map.get('permission') === 'commons' ? Metamaps.Mappers : Metamaps.Collaborators
     var string = ''
     string += '<ul>'
 
-    Metamaps.Mappers.each(function (m) {
+    relevantPeople.each(function (m) {
       string += '<li><a href="/explore/mapper/' + m.get('id') + '">' + '<img class="rtUserImage" width="25" height="25" src="' + m.get('image') + '" />' + m.get('name') + '</a></li>'
     })
 
@@ -576,18 +580,19 @@ Metamaps.Map.InfoBox = {
   updateNumbers: function () {
     var self = Metamaps.Map.InfoBox
     var mapper = Metamaps.Active.Mapper
+    var relevantPeople = Metamaps.Active.Map.get('permission') === 'commons' ? Metamaps.Mappers : Metamaps.Collaborators
 
     var contributors_class = ''
-    if (Metamaps.Mappers.length === 2) contributors_class = 'multiple mTwo'
+    if (relevantPeople.length === 2) contributors_class = 'multiple mTwo'
-    else if (Metamaps.Mappers.length > 2) contributors_class = 'multiple'
+    else if (relevantPeople.length > 2) contributors_class = 'multiple'
 
     var contributors_image = "<%= asset_path('user.png') %>"
-    if (Metamaps.Mappers.length > 0) {
+    if (relevantPeople.length > 0) {
       // get the first contributor and use their image
-      contributors_image = Metamaps.Mappers.models[0].get('image')
+      contributors_image = relevantPeople.models[0].get('image')
     }
     $('.mapContributors img').attr('src', contributors_image).removeClass('multiple mTwo').addClass(contributors_class)
-    $('.mapContributors span').text(Metamaps.Mappers.length)
+    $('.mapContributors span').text(relevantPeople.length)
     $('.mapContributors .tip').html(self.createContributorList())
     $('.mapTopics').text(Metamaps.Topics.length)
     $('.mapSynapses').text(Metamaps.Synapses.length)

app/assets/javascripts/src/Metamaps.js.erb

@@ -490,6 +490,8 @@ Metamaps.Backbone.init = function () {
 
     Metamaps.Mappers = Metamaps.Mappers ? new self.MapperCollection(Metamaps.Mappers) : new self.MapperCollection();
 
+    Metamaps.Collaborators = Metamaps.Collaborators ? new self.MapperCollection(Metamaps.Collaborators) : new self.MapperCollection();
+
     // this is for topic view
     Metamaps.Creators = Metamaps.Creators ? new self.MapperCollection(Metamaps.Creators) : new self.MapperCollection();
 

app/controllers/maps_controller.rb

@@ -88,12 +88,13 @@ class MapsController < ApplicationController
         respond_to do |format|
             format.html {
                 @allmappers = @map.contributors
+                @allcollaborators = @map.editors
                 @alltopics = @map.topics.to_a.delete_if {|t| not policy(t).show? }
                 @allsynapses = @map.synapses.to_a.delete_if {|s| not policy(s).show? }
                 @allmappings = @map.mappings.to_a.delete_if {|m| not policy(m).show? }
                 @allmessages = @map.messages.sort_by(&:created_at)
 
-                respond_with(@allmappers, @allmappings, @allsynapses, @alltopics, @allmessages, @map)
+                respond_with(@allmappers, @allcollaborators, @allmappings, @allsynapses, @alltopics, @allmessages, @map)
             }
             format.json { render json: @map }
             format.csv { redirect_to action: :export, format: :csv }
@@ -138,6 +139,7 @@ class MapsController < ApplicationController
         authorize @map
 
         @allmappers = @map.contributors
+        @allcollaborators = @map.editors
         @alltopics = @map.topics.to_a.delete_if {|t| not policy(t).show? }
         @allsynapses = @map.synapses.to_a.delete_if {|s| not policy(s).show? }
         @allmappings = @map.mappings.to_a.delete_if {|m| not policy(m).show? }
@@ -149,6 +151,7 @@ class MapsController < ApplicationController
         @json['synapses'] = @allsynapses
         @json['mappings'] = @allmappings
         @json['mappers'] = @allmappers
+        @json['collaborators'] = @allcollaborators
         @json['messages'] = @map.messages.sort_by(&:created_at)
 
         respond_to do |format|
@@ -241,6 +244,7 @@ class MapsController < ApplicationController
         removed = @map.collaborators.select { |user| not userIds.include?(user.id) }.map(&:id)
         added.each { |uid|
           um = UserMap.create({ user_id: uid.to_i, map_id: @map.id })
+          # send email here
         }
         removed.each { |uid|
           @map.user_maps.select{ |um| um.user_id == uid }.each{ |um| um.destroy }

app/models/map.rb

@@ -48,6 +48,10 @@ class Map < ActiveRecord::Base
     return contributors
   end
 
+  def editors
+    collaborators + [self.user]
+  end
+
   def topic_count
     topics.length
   end

app/views/maps/_mapinfobox.html.erb

@@ -12,17 +12,18 @@
   
   <div class="mapInfoStat">
     <div class="infoStatIcon mapContributors hoverForTip">
-      <% if @map.contributors.count == 0 %>
+      <% relevantPeople = @map.permission == "commons" ? @map.contributors : @map.editors %>
+      <% if relevantPeople.count == 0 %>
         <img id="mapContribs" width="25" height="25" src="<%= asset_path('user.png'); %>" />
-      <% elsif @map.contributors.count == 1 %>
+      <% elsif relevantPeople.count == 1 %>
-        <img id="mapContribs" width="25" height="25" src="<%= @map.contributors[0].image.url(:thirtytwo) %>" />
+        <img id="mapContribs" width="25" height="25" src="<%= relevantPeople[0].image.url(:thirtytwo) %>" />
-      <% elsif @map.contributors.count == 2 %>
+      <% elsif relevantPeople.count == 2 %>
-        <img id="mapContribs" width="25" height="25" src="<%= @map.contributors[0].image.url(:thirtytwo) %>" class="multiple mTwo" />
+        <img id="mapContribs" width="25" height="25" src="<%= relevantPeople[0].image.url(:thirtytwo) %>" class="multiple mTwo" />
-      <% elsif @map.contributors.count > 2 %>
+      <% elsif relevantPeople.count > 2 %>
-        <img id="mapContribs" width="25" height="25" src="<%= @map.contributors[0].image.url(:thirtytwo) %>" class="multiple" />
+        <img id="mapContribs" width="25" height="25" src="<%= relevantPeople[0].image.url(:thirtytwo) %>" class="multiple" />
       <% end %>
-      <span><%= @map.contributors.count %></span>
+      <span><%= relevantPeople.count %></span>
-      <div class="tip"> <ul><% @map.contributors.each_with_index do |c, index| %>
+      <div class="tip"> <ul><% relevantPeople.each_with_index do |c, index| %>
            <li ><a href="/explore/mapper/<%= c.id %>" > <img class="rtUserImage" width="25" height="25" src="<%= asset_path c.image.url(:thirtytwo) %>"  />
             <%= c.name %></a> 
             </li>         

app/views/maps/show.html.erb

@@ -10,6 +10,7 @@
 	Metamaps.currentPage = <%= @map.id.to_s %>;
     Metamaps.Active.Map = <%= @map.to_json.html_safe %>;
     Metamaps.Mappers = <%= @allmappers.to_json.html_safe %>;
+    Metamaps.Collaborators = <%= @allcollaborators.to_json.html_safe %>;
     Metamaps.Topics = <%= @alltopics.to_json.html_safe %>;
     Metamaps.Synapses = <%= @allsynapses.to_json.html_safe %>;
     Metamaps.Mappings = <%= @allmappings.to_json.html_safe %>;

config/routes.rb

@@ -40,16 +40,13 @@ Metamaps::Application.routes.draw do
   post 'maps/:id/events/:event', to: 'maps#events'
   get 'maps/:id/contains', to: 'maps#contains', as: :contains
   post 'maps/:id/upload_screenshot', to: 'maps#screenshot', as: :screenshot
+  post 'maps/:id/access', to: 'maps#access', as: :access, defaults: {format: :json} 
 
   get 'explore/active', to: 'maps#activemaps'
   get 'explore/featured', to: 'maps#featuredmaps'
   get 'explore/mine', to: 'maps#mymaps'
   get 'explore/shared', to: 'maps#sharedmaps'
   get 'explore/mapper/:id', to: 'maps#usermaps'
-
-  get 'maps/:id/contains', to: 'maps#contains', as: :contains
-  post 'maps/:id/upload_screenshot', to: 'maps#screenshot', as: :screenshot
-  post 'maps/:id/access', to: 'maps#access', as: :access, defaults: {format: :json} 
   
   devise_for :users, controllers: { registrations: 'users/registrations', passwords: 'users/passwords', sessions: 'devise/sessions' }, :skip => :sessions