scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-22 14:54:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2361 from urbanrotnik/ur-sci-4298-hide-buttons-on-column-manage

Browse source 
Hide Edit/Delete buttons if user do not has permissions [SCI-4298]
This commit is contained in:
Urban Rotnik 2020-01-27 08:46:09 +01:00 committed by GitHub
commit 76ef468484
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/repository_columns/index.js
View file

@ -281,7 +281,8 @@ var RepositoryColumns = (function() {
let visClass = (visible) ? 'fa-eye' : 'fa-eye-slash';
let visLi = (visible) ? '' : 'col-invisible';
let visText = $(TABLE_ID).data('columns-visibility-text');
let editLi = ($(el).attr('data-type')) ? 'editable' : '';
let customColumn = ($(el).attr('data-type')) ? 'editable' : '';
let editableRow = ($(el).attr('data-editable-row') === 'true') ? 'has-permissions' : '';
let editUrl = $(el).attr('data-edit-column-url');
let destroyUrl = $(el).attr('data-destroy-column-url');
let thederName;
@ -294,14 +295,14 @@ var RepositoryColumns = (function() {
visClass = '';
visText = '';
}
let listItem = `<li class="col-list-el ${visLi} ${editLi}" data-position="${colIndex}" data-id="${colId}">
let listItem = `<li class="col-list-el ${visLi} ${customColumn} ${editableRow}" data-position="${colIndex}" data-id="${colId}">
<i class="grippy"></i>
<span class="vis-controls">
<span class="vis fas ${visClass}" title="${visText}"></span>
</span>
<span class="text">${generateColumnNameTooltip(thederName)}</span>
<span class="column-type pull-right ${editLi}">${getColumnTypeText(el, colId)}</span>
<span class="sci-btn-group manage-controls pull-right ${editLi}">
<span class="column-type pull-right">${getColumnTypeText(el, colId)}</span>
<span class="sci-btn-group manage-controls pull-right">
<button class="btn icon-btn btn-light edit-repo-column manage-repo-column"
data-action="edit"
data-modal-url="${editUrl}">

16
app/assets/stylesheets/repository_columns/index.scss
View file

@ -124,12 +124,14 @@
}
&:hover {
.editable {
display: inline-block;
}
&.editable.has-permissions {
.manage-controls {
display: inline-block;
}
.column-type.editable {
display: none;
.column-type {
display: none;
}
}
.grippy {
@ -210,11 +212,11 @@
}
&[data-task-page=true] {
.repo-columns-list>.editable:hover>.manage-controls {
.repo-columns-list>.col-list-el:hover.editable.has-permissions>.manage-controls {
display: none;
}
.repo-columns-list>.editable:hover>.column-type {
.repo-columns-list>.col-list-el:hover.editable.has-permissions>.column-type {
display: inline-block;
}

1
app/views/repositories/_repository_table.html.erb
View file

@ -38,6 +38,7 @@
data-type="<%= column.data_type %>"
data-edit-column-url="<%= edit_repository_repository_column_path(repository, column) %>"
data-destroy-column-url="<%= repository_columns_destroy_html_path(repository, column) %>"
data-editable-row="<%= can_manage_repository_column?(column) %>"
<% column.metadata.each do |k, v| %>
<%= "data-metadata-#{k}=#{v}" %>
<% end %>