branch/tag remember - to session instead of cookie

gitlabhq
1 parent fc34fc86
Showing 4 changed files with 19 additions and 17 deletions Show diff stats
app/controllers/application_controller.rb
app/helpers/projects_helper.rb
app/views/commits/index.html.haml
app/views/projects/_tree.html.haml
@@ -43,11 +43,14 @@ class ApplicationController &lt; ActionController::Base
   end
   def refs_from_cookie
-    # branch is high priority so we should reset
-    # it if tag selected
-    cookies[:branch] = nil if params[:tag]
-
-    params[:branch] ||= cookies[:branch]
-    params[:tag] ||= cookies[:tag]
+    if @project && session[:ui] && 
+      session[:ui][@project.id]
+      project_session = session[:ui][@project.id]
+      project_session[:branch] = nil if params[:tag]
+      params[:branch] ||= project_session[:branch]
+      params[:tag] ||= project_session[:tag]
+    end
+  rescue 
+    session[:ui] = nil
   end
 end
@@ -3,4 +3,12 @@ module ProjectsHelper
     cookies["project_view"] ||= "tile"
     cookies["project_view"] == type ? nil : "display:none"
   end
+
+  def remember_refs
+    session[:ui] ||= {}
+    session[:ui][@project.id] = { 
+      :branch => params[:branch],
+      :tag => params[:tag]
+    }
+  end
 end
@@ -14,9 +14,4 @@
   %div{:id => dom_id(@project)}
     = render "commits"
-
-:javascript
-  $(function(){
-    $.cookie('branch', '#{params[:branch]}', { expires: 1 });
-    $.cookie('tag', '#{params[:tag]}', { expires: 1 });
-  });
+- remember_refs
@@ -46,11 +46,7 @@
         = render :partial => "projects/tree_item", :locals => { :content => content }
-:javascript
-  $(function(){
-    $.cookie('branch', '#{params[:branch]}', { expires: 1 });
-    $.cookie('tag', '#{params[:tag]}', { expires: 1 });
-  });
+- remember_refs
 :javascript
   $(function(){
	@@ -3,4 +3,12 @@ module ProjectsHelper		@@ -3,4 +3,12 @@ module ProjectsHelper
3	cookies["project_view"] \|\|= "tile"	3	cookies["project_view"] \|\|= "tile"
4	cookies["project_view"] == type ? nil : "display:none"	4	cookies["project_view"] == type ? nil : "display:none"
5	end	5	end
		6	+
		7	+ def remember_refs
		8	+ session[:ui] \|\|= {}
		9	+ session[:ui][@project.id] = {
		10	+ :branch => params[:branch],
		11	+ :tag => params[:tag]
		12	+ }
		13	+ end
6	end	14	end
	@@ -14,9 +14,4 @@		@@ -14,9 +14,4 @@
14	%div{:id => dom_id(@project)}	14	%div{:id => dom_id(@project)}
15	= render "commits"	15	= render "commits"
16		16
17	-
18	-:javascript
19	- $(function(){
20	- $.cookie('branch', '#{params[:branch]}', { expires: 1 });
21	- $.cookie('tag', '#{params[:tag]}', { expires: 1 });
22	- });	17	+- remember_refs