diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-27 13:12:12 +0500 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-27 13:12:12 +0500 |
| commit | 325b84545ca09911df0bf80a7233b339aba755ed (patch) | |
| tree | 02b24b209eee622df249d155d71941ec2779cbf9 | |
| parent | 000c032482dbe2fe882f3b2583fe1a481edf460a (diff) | |
| download | gitlab-ce-325b84545ca09911df0bf80a7233b339aba755ed.tar.gz | |
don't count expired snippets
| -rw-r--r-- | app/models/snippet.rb | 1 | ||||
| -rw-r--r-- | app/views/projects/_top_menu.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/snippet.rb b/app/models/snippet.rb index 44cb88872a9..b67db60b78a 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -23,6 +23,7 @@ class Snippet < ActiveRecord::Base :length => { :within => 0..10000 } scope :fresh, order("created_at DESC") + scope :non_expired, where(["expires_at IS NULL OR expires_at > ?", Time.current]) def self.content_types [ diff --git a/app/views/projects/_top_menu.html.haml b/app/views/projects/_top_menu.html.haml index 59f2533ea7f..0b8751c93cc 100644 --- a/app/views/projects/_top_menu.html.haml +++ b/app/views/projects/_top_menu.html.haml @@ -23,7 +23,7 @@ = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do Snippets - if @project.snippets.count > 0 - %span{ :class => "top_menu_count" }= @project.snippets.count + %span{ :class => "top_menu_count" }= @project.snippets.non_expired.count - if @commit %span= link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil |