diff --git a/redmine/app/helpers/custom_fields_helper.rb b/redmine/app/helpers/custom_fields_helper.rb index 82ace31..ac8b555 100644 --- a/redmine/app/helpers/custom_fields_helper.rb +++ b/redmine/app/helpers/custom_fields_helper.rb @@ -54,6 +54,8 @@ module CustomFieldsHelper # Return a string used to display a custom value def show_value(custom_value) case custom_value.custom_field.field_format + when "date" + format_date(custom_value.value.to_date) when "bool" l_YesNo(custom_value.value == "1") else diff --git a/redmine/app/models/user.rb b/redmine/app/models/user.rb index ba489ac..5ff19f2 100644 --- a/redmine/app/models/user.rb +++ b/redmine/app/models/user.rb @@ -88,7 +88,11 @@ class User < ActiveRecord::Base def active? self.status == STATUS_ACTIVE end - + + def registered? + self.status == STATUS_REGISTERED + end + def locked? self.status == STATUS_LOCKED end diff --git a/redmine/app/views/layouts/base.rhtml b/redmine/app/views/layouts/base.rhtml index 33ddd8f..dc470f2 100644 --- a/redmine/app/views/layouts/base.rhtml +++ b/redmine/app/views/layouts/base.rhtml @@ -13,7 +13,7 @@ <%= javascript_include_tag 'calendar/calendar' %> <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %> <%= javascript_include_tag 'calendar/calendar-setup' %> -<%= stylesheet_link_tag 'calendar/calendar-blue' %> +<%= stylesheet_link_tag 'calendar' %>