scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-31 12:09:17 +08:00
Code Issues Projects Releases Packages Wiki Activity

Make share status icon dynamic (#2007)

Browse source
This commit is contained in:
aignatov-bio 2019-08-21 15:32:57 +02:00 committed by GitHub
parent 5e3f1d59f5
commit d70b7e2272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,6 +145,7 @@
if (data.warnings) {
alert(data.warnings);
}
$('.repository-share-status').toggleClass('hidden', !data.status);
$('.share-repo-modal').modal('hide');
},
error: function(data) {

1
app/assets/stylesheets/partials/_tree_view.scss
View file

@ -111,6 +111,7 @@
#repo-tree {
.fas-custom {
float: right;
top: 2px;
}
.active {

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

@ -22,6 +22,13 @@
}
}
.repository-share-status {
display: contents !important;
&.hidden {
display: none !important;
}
}
.repository-table {
margin-top: 20px;

2
app/controllers/team_repositories_controller.rb
View file

@ -43,7 +43,7 @@ class TeamRepositoriesController < ApplicationController
team_ids_for_update: teams_to_update,
**share_all_params)
if service_call.succeed?
render json: { warnings: service_call.warnings.join(', ') }, status: :ok
render json: { warnings: service_call.warnings.join(', '), status: @repository.i_shared?(current_team) }, status: :ok
else
render json: { errors: service_call.errors.map { |_, v| v }.join(', ') }, status: :unprocessable_entity
end

6
app/views/repositories/_sidebar.html.erb
View file

@ -30,8 +30,10 @@
<% else %>
<%= draw_custom_icon('shared-read') %>
<% end %>
<% elsif repository.i_shared?(current_team) %>
<%= draw_custom_icon('i-shared') %>
<% else %>
<span class="repository-share-status <%= "hidden" unless @repository.i_shared?(current_team) %>" >
<%= draw_custom_icon('i-shared') %>
</span>
<% end %>
</span>
</li>

6
app/views/repositories/show.html.erb
View file

@ -18,8 +18,10 @@
<% else %>
<%= draw_custom_icon('shared-read') %>
<% end %>
<% elsif @repository.i_shared?(current_team) %>
<%= draw_custom_icon('i-shared') %>
<% else %>
<span class="repository-share-status <%= "hidden" unless @repository.i_shared?(current_team) %>" >
<%= draw_custom_icon('i-shared') %>
</span>
<% end %>
</span>
<div class="repository-title">