From 1ee69714df3bdeea44ed9a572a922995beef958d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 14 Jan 2012 21:44:08 +0200 Subject: [PATCH] cleaning dashboard files --- app/controllers/dashboard_controller.rb | 13 +------------ app/views/dashboard/index.js.haml | 7 ------- app/views/dashboard/issues.js.haml | 7 ------- app/views/dashboard/merge_requests.js.haml | 7 ------- 4 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 app/views/dashboard/index.js.haml delete mode 100644 app/views/dashboard/issues.js.haml delete mode 100644 app/views/dashboard/merge_requests.js.haml diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index c256b42cc..6a8fd1c30 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -1,25 +1,15 @@ class DashboardController < ApplicationController - respond_to :js, :html + respond_to :html def index @projects = current_user.projects.all @active_projects = @projects.select(&:repo_exists?).select(&:last_activity_date_cached).sort_by(&:last_activity_date_cached).reverse - - respond_to do |format| - format.html - format.js { no_cache_headers } - end end # Get authored or assigned open merge requests def merge_requests @projects = current_user.projects.all @merge_requests = MergeRequest.where("author_id = :id or assignee_id = :id", :id => current_user.id).opened.order("created_at DESC").limit(40) - - respond_to do |format| - format.html - format.js { no_cache_headers } - end end # Get only assigned issues @@ -32,7 +22,6 @@ class DashboardController < ApplicationController respond_to do |format| format.html - format.js { no_cache_headers } format.atom { render :layout => false } end end diff --git a/app/views/dashboard/index.js.haml b/app/views/dashboard/index.js.haml deleted file mode 100644 index 44b3b801f..000000000 --- a/app/views/dashboard/index.js.haml +++ /dev/null @@ -1,7 +0,0 @@ -:plain - $("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){ - $("#news-feed").html("#{escape_javascript(render(:partial => "projects_feed"))}"); - $("#feeds_content_holder").show("slide", { direction: "right" }, 150); - history.pushState({ path: this.path }, '', '#{dashboard_path}') - }); - diff --git a/app/views/dashboard/issues.js.haml b/app/views/dashboard/issues.js.haml deleted file mode 100644 index 30a71af6c..000000000 --- a/app/views/dashboard/issues.js.haml +++ /dev/null @@ -1,7 +0,0 @@ -:plain - $("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){ - $("#news-feed").html("#{escape_javascript(render(:partial => "issues_feed"))}"); - $("#feeds_content_holder").show("slide", { direction: "right" }, 150); - history.pushState({ path: this.path }, '', '#{dashboard_issues_path}') - }); - diff --git a/app/views/dashboard/merge_requests.js.haml b/app/views/dashboard/merge_requests.js.haml deleted file mode 100644 index 81d3424b5..000000000 --- a/app/views/dashboard/merge_requests.js.haml +++ /dev/null @@ -1,7 +0,0 @@ -:plain - $("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){ - $("#news-feed").html("#{escape_javascript(render(:partial => "merge_requests_feed"))}"); - $("#feeds_content_holder").show("slide", { direction: "right" }, 150); - history.pushState({ path: this.path }, '', '#{dashboard_merge_requests_path}') - }); - -- 2.11.0