senaduka/old-holivud2
1
0
Fork 0
Code Issues Pull Requests 6 Actions Packages Projects Releases Wiki Activity

Upstream sync

Browse Source
This commit is contained in:
Senad Uka
2020-07-02 10:34:24 +02:00
parent e49498bbbf
commit d6a3542308
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/account.rb
View File

@@ -84,7 +84,7 @@ class Account < ApplicationRecord
end end
def taskme_enabled? def taskme_enabled?
plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme" ENV["TASKME_ENABLED"] && (plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme")
end end
def plan_name def plan_name

14
app/views/application/_sidebar.html.erb
View File

@@ -11,12 +11,14 @@
<hr class="divider-light mx-n4"> <hr class="divider-light mx-n4">
<nav> <nav>
<ul class="nav nav-pills nav-pills-dark flex-column"> <ul class="nav nav-pills nav-pills-dark flex-column">
<li class="nav-item"> <% if Current.account.taskme_enabled? %>
<%= link_to [project, :task_requests], class: class_string("nav-link", "active" => controller_name == "task_requests") do %> <li class="nav-item">
<%= lock_icon_for(Current.account, :taskme) %> <%= link_to [project, :task_requests], class: class_string("nav-link", "active" => controller_name == "task_requests") do %>
<%= product_wordmark :task_me, class: class_string("d-inline-block", "disabled" => !Current.account.taskme_enabled?) %> <%= lock_icon_for(Current.account, :taskme) %>
<% end %> <%= product_wordmark :task_me, class: class_string("d-inline-block", "disabled" => !Current.account.taskme_enabled?) %>
</li> <% end %>
</li>
<% end %>
<li class="nav-item"> <li class="nav-item">
<%= link_to [project, :contract_templates], class: class_string("nav-link", "active" => %w(contract_templates release_template_imports).include?(controller_name)) do %> <%= link_to [project, :contract_templates], class: class_string("nav-link", "active" => %w(contract_templates release_template_imports).include?(controller_name)) do %>
<%= lock_icon_for Current.account, :releaseme %> <%= lock_icon_for Current.account, :releaseme %>