scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into SCI-3806-shared-status-dropdown

Browse source
This commit is contained in:
Miha Mencin 2019-08-26 11:55:25 +02:00 committed by GitHub
parent a7bb7a1dd8 ffe06d5070
commit 0058198bb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/repositories/index.js
View file

@ -145,7 +145,9 @@
if (data.warnings) {
alert(data.warnings);
}
$('.repository-share-status').toggleClass('hidden', !data.status);
$(`#slide-panel li.active .repository-share-status,
#repository-toolbar .repository-share-status
`).toggleClass('hidden', !data.status);
$('.share-repo-modal').modal('hide');
},
error: function(data) {

6
app/assets/stylesheets/repositories.scss
View file

@ -210,3 +210,9 @@
}
}
}
#repository_row-info-table {
.fas {
color: $color-silver-chalice;
}
}

1
app/assets/stylesheets/themes/scinote.scss
View file

@ -322,6 +322,7 @@ a[data-toggle="tooltip"] {
.nav-name {
height: 54px;
line-height: 44px;
margin: 0;
overflow: hidden;
padding: 5px 0;
text-overflow: ellipsis;

2
app/services/repositories/multiple_share_update_service.rb
View file

@ -98,7 +98,7 @@ module Repositories
return false
end
if can_manage_repository?(@user, @repository)
if can_share_repository?(@user, @repository)
true
else
@errors[:user_without_permissions] =

14
app/views/repositories/_repository_row_info_modal.html.erb
View file

@ -50,15 +50,23 @@
<tr role="row">
<td class="sorting_1">
<ol class='breadcrumb'>
<li><span class='fas fa-folder'></span>&nbsp;
<li>
<span class='fas fa-users'></span>&nbsp;
<%= render partial: "search/results/partials/team_text.html.erb",
locals: { team: element.my_module.experiment.project.team } %>
</li>
<li>
<%= image_tag 'icon_small/project.svg' %>
<%= render partial: 'search/results/partials/project_text.html.erb',
locals: { project: element.my_module.experiment.project } %>
</li>
<li><i class='fas fa-flask'></i>&nbsp;
<li>
<%= image_tag 'icon_small/experiment.svg' %>
<%= render partial: 'search/results/partials/experiment_text.html.erb',
locals: { experiment: element.my_module.experiment } %>
</li>
<li><span class='fas fa-credit-card'></span>&nbsp;
<li>
<%= image_tag 'icon_small/task.svg' %>
<%= render partial: 'search/results/partials/my_module_text.html.erb',
locals: { my_module: element.my_module,
link_to_page: :repositories,