2 files changed, 95 insertions, 1 deletions
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 2de351c07..805418d3d 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -76,7 +76,7 @@ Redmine::Scm::Base.add "Filesystem"
 
 # Permissions
 Redmine::AccessControl.map do |map|
-  map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true, :read => true
+  map.permission :view_project, {:projects => [:show, :bookmark], :activities => [:index]}, :public => true, :read => true
   map.permission :search_project, {:search => :index}, :public => true, :read => true
   map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
   map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
diff --git a/lib/redmine/project_jump_box.rb b/lib/redmine/project_jump_box.rb
new file mode 100644
index 000000000..5978dc19a
--- /dev/null
+++ b/lib/redmine/project_jump_box.rb
@@ -0,0 +1,94 @@
+module Redmine
+  class ProjectJumpBox
+    def initialize(user)
+      @user = user
+      @pref_project_ids = {}
+    end
+
+    def recent_projects_count
+      @user.pref.recently_used_projects
+    end
+
+    def recently_used_projects(query = nil)
+      project_ids = recently_used_project_ids
+      projects = Project.where(id: project_ids)
+      if query
+        projects = projects.like(query)
+      end
+      projects.
+        index_by(&:id).
+        values_at(*project_ids). # sort according to stored order
+        compact
+    end
+
+    def bookmarked_projects(query = nil)
+      projects = Project.where(id: bookmarked_project_ids).visible
+      if query
+        projects = projects.like(query)
+      end
+      projects.to_a
+    end
+
+    def project_used(project)
+      return if project.blank? || project.id.blank?
+
+      id_array = recently_used_project_ids
+      id_array.reject!{ |i| i == project.id }
+      # we dont want bookmarks in the recently used list:
+      id_array.unshift(project.id) unless bookmark?(project)
+      self.recently_used_project_ids = id_array[0, recent_projects_count]
+    end
+
+    def bookmark_project(project)
+      self.recently_used_project_ids = recently_used_project_ids.reject{|id| id == project.id}
+      self.bookmarked_project_ids = (bookmarked_project_ids << project.id)
+    end
+
+    def delete_project_bookmark(project)
+      self.bookmarked_project_ids = bookmarked_project_ids.reject do |id|
+        id == project.id
+      end
+    end
+
+    def bookmark?(project)
+      project && project.id && bookmarked_project_ids.include?(project.id)
+    end
+
+    private
+
+    def bookmarked_project_ids
+      pref_project_ids :bookmarked_project_ids
+    end
+
+    def bookmarked_project_ids=(new_ids)
+      set_pref_project_ids :bookmarked_project_ids, new_ids
+    end
+
+    def recently_used_project_ids
+      pref_project_ids(:recently_used_project_ids)[0,recent_projects_count]
+    end
+
+    def recently_used_project_ids=(new_ids)
+      set_pref_project_ids :recently_used_project_ids, new_ids
+    end
+
+    def pref_project_ids(key)
+      return [] unless @user.logged?
+
+      @pref_project_ids[key] ||= (@user.pref[key] || '').split(',').map(&:to_i)
+    end
+
+    def set_pref_project_ids(key, new_values)
+      return nil unless @user.logged?
+
+      old_value = @user.pref[key]
+      new_value = new_values.uniq.join(',')
+      if old_value != new_value
+        @user.pref[key] = new_value
+        @user.pref.save
+      end
+      @pref_project_ids.delete key
+      nil
+    end
+  end
+end