Commit ab418e27 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Improve external users feature

parent 88f8d3a4
...@@ -47,9 +47,9 @@ class ProjectsFinder ...@@ -47,9 +47,9 @@ class ProjectsFinder
group.shared_projects.visible_to_user(current_user) group.shared_projects.visible_to_user(current_user)
] ]
if current_user.external? if current_user.external?
user_group_projects.push(group.projects.public_only) user_group_projects << group.projects.public_only
else else
user_group_projects.push(group.projects.public_and_internal_only) user_group_projects << group.projects.public_and_internal_only
end end
end end
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
.form-group .form-group
= f.label :external, class: 'control-label' = f.label :external, class: 'control-label'
.col-sm-10= f.check_box :external .col-sm-10= f.check_box :external
.col-sm-10 External users can not see internal or private projects unless access is explicitly granted. Also, external user can not create projects or groups. .col-sm-10 External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects or groups.
%fieldset %fieldset
%legend Profile %legend Profile
......
...@@ -74,12 +74,14 @@ ...@@ -74,12 +74,14 @@
%li %li
.list-item-name .list-item-name
- if user.blocked? - if user.blocked?
%i.fa.fa-lock.cred = icon("lock", class: "cred")
- else - else
%i.fa.fa-user.cgreen = icon("user", class: "cgreen")
= link_to user.name, [:admin, user] = link_to user.name, [:admin, user]
- if user.admin? - if user.admin?
%strong.cred (Admin) %strong.cred (Admin)
- if user.external?
%strong.cred (External)
- if user == current_user - if user == current_user
%span.cred It's you! %span.cred It's you!
.pull-right .pull-right
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
- if current_user.can_create_project? - if current_user.can_create_project?
.link_holder .link_holder
= link_to new_project_path, class: "btn btn-new" do = link_to new_project_path, class: "btn btn-new" do
=icon('plus') = icon('plus')
New Project New Project
- if current_user.can_create_group? - if current_user.can_create_group?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment