mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 23:46:21 +08:00
Merge pull request #7109 from G-Chubinidze/gc_SCI_10189
To add "Archived on"column to Projects table (archived state) & rename column titles of "archived on" [SCI-10189]
This commit is contained in:
commit
35087f202e
|
@ -114,9 +114,12 @@ export default {
|
||||||
objectsToMove: null,
|
objectsToMove: null,
|
||||||
reloadingTable: false,
|
reloadingTable: false,
|
||||||
folderDeleteDescription: '',
|
folderDeleteDescription: '',
|
||||||
exportDescription: '',
|
exportDescription: ''
|
||||||
columnDefs: [
|
};
|
||||||
{
|
},
|
||||||
|
computed: {
|
||||||
|
columnDefs() {
|
||||||
|
const columns = [{
|
||||||
field: 'name',
|
field: 'name',
|
||||||
flex: 1,
|
flex: 1,
|
||||||
headerName: this.i18n.t('projects.index.card.name'),
|
headerName: this.i18n.t('projects.index.card.name'),
|
||||||
|
@ -131,8 +134,7 @@ export default {
|
||||||
{
|
{
|
||||||
field: 'created_at',
|
field: 'created_at',
|
||||||
headerName: this.i18n.t('projects.index.card.start_date'),
|
headerName: this.i18n.t('projects.index.card.start_date'),
|
||||||
sortable: true,
|
sortable: true
|
||||||
minWidth: 130
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'users',
|
field: 'users',
|
||||||
|
@ -141,11 +143,18 @@ export default {
|
||||||
sortable: false,
|
sortable: false,
|
||||||
minWidth: 210,
|
minWidth: 210,
|
||||||
notSelectable: true
|
notSelectable: true
|
||||||
|
}];
|
||||||
|
|
||||||
|
if (this.currentViewMode === 'archived') {
|
||||||
|
columns.push({
|
||||||
|
field: 'archived_on',
|
||||||
|
headerName: this.i18n.t('projects.index.card.archived_date'),
|
||||||
|
sortable: true
|
||||||
|
});
|
||||||
}
|
}
|
||||||
]
|
|
||||||
};
|
return columns;
|
||||||
},
|
},
|
||||||
computed: {
|
|
||||||
viewRenders() {
|
viewRenders() {
|
||||||
return [
|
return [
|
||||||
{ type: 'table' },
|
{ type: 'table' },
|
||||||
|
|
|
@ -570,7 +570,7 @@ en:
|
||||||
visibility: "Visible to"
|
visibility: "Visible to"
|
||||||
users: "Members"
|
users: "Members"
|
||||||
name: "Project name"
|
name: "Project name"
|
||||||
archived_date: "Archived"
|
archived_date: "Archived on"
|
||||||
end_of_list_placeholder: 'You’ve reached the end of the list'
|
end_of_list_placeholder: 'You’ve reached the end of the list'
|
||||||
folder:
|
folder:
|
||||||
description: "%{projects_count} projects | %{folders_count} folders"
|
description: "%{projects_count} projects | %{folders_count} folders"
|
||||||
|
@ -1462,7 +1462,7 @@ en:
|
||||||
id: "ID"
|
id: "ID"
|
||||||
start_date: "Start date"
|
start_date: "Start date"
|
||||||
modified_date: "Modified date"
|
modified_date: "Modified date"
|
||||||
archived_date: "Archived date"
|
archived_date: "Archived on"
|
||||||
completed_task: "Completed"
|
completed_task: "Completed"
|
||||||
completed_value: "%{completed}/%{all} tasks"
|
completed_value: "%{completed}/%{all} tasks"
|
||||||
description: "Description"
|
description: "Description"
|
||||||
|
@ -1537,7 +1537,7 @@ en:
|
||||||
id_html: 'ID'
|
id_html: 'ID'
|
||||||
task_name_html: 'Task name'
|
task_name_html: 'Task name'
|
||||||
due_date_html: 'Due date'
|
due_date_html: 'Due date'
|
||||||
archived_html: 'Archived'
|
archived_html: 'Archived on'
|
||||||
age_html: 'Age'
|
age_html: 'Age'
|
||||||
results_html: 'Results'
|
results_html: 'Results'
|
||||||
status_html: 'Status'
|
status_html: 'Status'
|
||||||
|
@ -4100,7 +4100,7 @@ en:
|
||||||
updated_on:
|
updated_on:
|
||||||
label: "Modified date"
|
label: "Modified date"
|
||||||
archived_on:
|
archived_on:
|
||||||
label: "Archived date"
|
label: "Archived on"
|
||||||
recent_searches_label: "Recent searches"
|
recent_searches_label: "Recent searches"
|
||||||
show_btn:
|
show_btn:
|
||||||
one: "Show results"
|
one: "Show results"
|
||||||
|
|
Loading…
Reference in a new issue