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

Merge pull request #7746 from rekonder/aj_SCI_10911

Browse source 
Add disabled tag to repository columns [SCI-10911]
This commit is contained in:
ajugo 2024-07-30 14:01:58 +02:00 • committed by GitHub
commit 9a18c70eb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -284,6 +284,7 @@ var RepositoryColumns = (function() {
let editableRow = ($(el).attr('data-editable-row') === 'true') ? 'has-permissions' : ''; let editableRow = ($(el).attr('data-editable-row') === 'true') ? 'has-permissions' : '';
let editUrl = $(el).attr('data-edit-column-url'); let editUrl = $(el).attr('data-edit-column-url');
let destroyUrl = $(el).attr('data-destroy-column-url'); let destroyUrl = $(el).attr('data-destroy-column-url');
const isDisabled = $(el).attr('data-disabled') === 'true';
let thederName; let thederName;
if ($(el).find('.modal-tooltiptext').length > 0) { if ($(el).find('.modal-tooltiptext').length > 0) {
@ -315,7 +316,9 @@ var RepositoryColumns = (function() {
<span class="vis-controls"> <span class="vis-controls">
<span class="vis sn-icon ${visClass}" title="${visText}" data-e2e="e2e-BT-invItems-manageColumnsModal-${e2eName}-visibility"></span> <span class="vis sn-icon ${visClass}" title="${visText}" data-e2e="e2e-BT-invItems-manageColumnsModal-${e2eName}-visibility"></span>
</span> </span>
<div class="text truncate" title="${thederName}" data-e2e="e2e-TX-invItems-manageColumnsModal-${e2eName}-columnName">${thederName}</div> <div class="text truncate" title="${thederName}" data-e2e="e2e-TX-invItems-manageColumnsModal-${e2eName}-columnName">
${thederName} ${isDisabled ? `<span data-e2e="e2e-LB-invItems-manageColumnsModal-${e2eName}-disabled"></span>` : ''}
</div>
<span class="column-type pull-right shrink-0">${ <span class="column-type pull-right shrink-0">${
getColumnTypeText(el, colId) || `<i class="sn-icon sn-icon-locked-task" data-e2e="e2e-IC-invItems-manageColumnsModal-${e2eName}-locked"></i>` getColumnTypeText(el, colId) || `<i class="sn-icon sn-icon-locked-task" data-e2e="e2e-IC-invItems-manageColumnsModal-${e2eName}-locked"></i>`
}</span> }</span>

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

@ -37,7 +37,8 @@
<th id="assigned" data-unmanageable="true"><%= t("repositories.table.assigned") %></th> <th id="assigned" data-unmanageable="true"><%= t("repositories.table.assigned") %></th>
<th id="row-id"><%= t("repositories.table.id") %></th> <th id="row-id"><%= t("repositories.table.id") %></th>
<th id="row-name"><%= t("repositories.table.row_name") %></th> <th id="row-name"><%= t("repositories.table.row_name") %></th>
<th id="relationship" title="<%= t("repositories.table.relationships") %>"><%= t("repositories.table.relationships") %></th> <th id="relationship" data-disabled="<%= !Repository.repository_row_connections_enabled? %>"
title="<%= t("repositories.table.relationships") %>"><%= t("repositories.table.relationships") %></th>
<th id="added-on" ><%= t("repositories.table.added_on") %></th> <th id="added-on" ><%= t("repositories.table.added_on") %></th>
<th id="added-by" ><%= t("repositories.table.added_by") %></th> <th id="added-by" ><%= t("repositories.table.added_by") %></th>
<th id="updated-on" ><%= t("repositories.table.updated_on") %></th> <th id="updated-on" ><%= t("repositories.table.updated_on") %></th>