Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Merging from main master to my repo master. #4

Closed
Karavel wants to merge 53 commits from fixin.me/fixin.me:master into master
pull from: fixin.me/fixin.me:master
merge into: Karavel:master
Conversation 0 Commits 53 Files Changed 50 +10 -6
7 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e75391ae18 - Show all commits

2
app/helpers/application_helper.rb
View File

@ -84,7 +84,7 @@ module ApplicationHelper
[:button_to, :link_to, :link_to_unless_current].each do |method_name| [:button_to, :link_to, :link_to_unless_current].each do |method_name|
class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1 class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
def image_#{method_name}(name, image = nil, options = nil, html_options = {}, &block) def image_#{method_name}(name, image = nil, options = nil, html_options = {}, &block)
name = svg_tag("pictograms/\#{image}") + name if image name = svg_tag("pictograms/\#{image}") + name.to_s if image
html_options[:class] = class_names( html_options[:class] = class_names(
html_options[:class], html_options[:class],

4
app/models/user.rb
View File

@ -13,6 +13,10 @@ class User < ApplicationRecord
has_many :units, dependent: :destroy has_many :units, dependent: :destroy
def to_s
email
end
def at_least(status) def at_least(status)
User.statuses[self.status] >= User.statuses[status] User.statuses[self.status] >= User.statuses[status]
end end

2
app/views/layouts/application.html.erb
View File

@ -29,7 +29,7 @@
<%= image_link_to t(".issue_tracker"), "bug-outline", issue_tracker_url, <%= image_link_to t(".issue_tracker"), "bug-outline", issue_tracker_url,
class: "extendedright" %> class: "extendedright" %>
<% if user_signed_in? %> <% if user_signed_in? %>
<%= image_link_to_unless_current(current_user.email, "account-wrench-outline", <%= image_link_to_unless_current(current_user, "account-wrench-outline",
edit_user_registration_path) {} %> edit_user_registration_path) {} %>
<% if current_user_disguised? %> <% if current_user_disguised? %>
<%= image_link_to t(".revert"), "incognito-off", revert_users_path %> <%= image_link_to t(".revert"), "incognito-off", revert_users_path %>

2
app/views/users/index.html.erb
View File

@ -11,7 +11,7 @@
<tbody> <tbody>
<% @users.each do |user| %> <% @users.each do |user| %>
<tr> <tr>
<td class="link"><%= link_to user.email, user_path(user) %></td> <td class="link"><%= link_to user, user_path(user) %></td>
<td> <td>
<% if user == current_user %> <% if user == current_user %>
<%= user.status %> <%= user.status %>

2
app/views/users/mailer/password_change.html.erb
View File

@ -1,3 +1,3 @@
<p>Hello <%= @resource.email %>!</p> <p>Hello <%= @resource %>!</p>
<p>We're contacting you to notify you that your password has been changed.</p> <p>We're contacting you to notify you that your password has been changed.</p>

2
app/views/users/mailer/reset_password_instructions.html.erb
View File

@ -1,4 +1,4 @@
<p>Hello <%= @resource.email %>!</p> <p>Hello <%= @resource %>!</p>
<p>Someone has requested a link to change your password. You can do this through the link below.</p> <p>Someone has requested a link to change your password. You can do this through the link below.</p>

2
app/views/users/mailer/unlock_instructions.html.erb
View File

@ -1,4 +1,4 @@
<p>Hello <%= @resource.email %>!</p> <p>Hello <%= @resource %>!</p>
<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p> <p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>