From 029436f23a93d0506f2096c0246dd0acd717509c Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 17 Feb 2013 01:45:11 -0500 Subject: [PATCH] add builder --- app/models/user.rb | 11 ++++++++++- app/views/forum_topics/index.html.erb | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 56f6f2a5c..04096e65a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,6 +7,7 @@ class User < ActiveRecord::Base module Levels MEMBER = 20 PRIVILEGED = 30 + BUILDER = 32 CONTRIBUTOR = 33 JANITOR = 35 MODERATOR = 40 @@ -218,6 +219,7 @@ class User < ActiveRecord::Base return { "Member" => Levels::MEMBER, "Privileged" => Levels::PRIVILEGED, + "Builder" => Levels::BUIDLER, "Contributor" => Levels::CONTRIBUTOR, "Janitor" => Levels::JANITOR, "Moderator" => Levels::MODERATOR, @@ -236,7 +238,7 @@ class User < ActiveRecord::Base def role case level - when Levels::MEMBER, Levels::PRIVILEGED, Levels::CONTRIBUTOR + when Levels::MEMBER, Levels::PRIVILEGED, Levels::BUILDER, Levels::CONTRIBUTOR :member when Levels::MODERATOR, Levels::JANITOR @@ -252,6 +254,9 @@ class User < ActiveRecord::Base when Levels::MEMBER "Member" + when Levels::BUILDER + "Builder" + when Levels::PRIVILEGED "Privileged" @@ -277,6 +282,10 @@ class User < ActiveRecord::Base true end + def is_builder? + level >= Levels::BUILDER + end + def is_privileged? level >= Levels::PRIVILEGED end diff --git a/app/views/forum_topics/index.html.erb b/app/views/forum_topics/index.html.erb index d26bed1ab..0332e49a7 100644 --- a/app/views/forum_topics/index.html.erb +++ b/app/views/forum_topics/index.html.erb @@ -26,7 +26,7 @@ <%= link_to topic.title, forum_topic_path(topic) %> <% if topic.response_count > 30 %> - <%= link_to "last", forum_topic_path(topic, :page => (topic.response_count / Danbooru.config.posts_per_page.to_f).ceil), :class => "last-page" %> + <%= link_to "last", forum_topic_path(topic, :page => topic.last_page, :class => "last-page" %> <% end %> <% if topic.is_locked? %>