Commit e493c24e authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch...

Merge branch '683-please-disable-edit-remove-icons-during-uploading-removing-a-project' into 'master'

Resolve "Please disable Edit/Remove icons during uploading/removing a project"

Closes #683

See merge request !693
parents 8d562137 fd0daaca
......@@ -10,6 +10,8 @@ minerva (12.3.0~alpha.0) unstable; urgency=low
* Small improvement: Plugin API allows to show/hide overview images (#702)
* Small improvement: Plugin API allows to trigger search on the map (#702)
* Small improvement: Plugin API allows to clear search results on map (#702)
* Small improvement: edit/remove project button is disabled until project is
uploaded (#683)
* Bug fix: progress bar of gene genome mapping upload is refreshing properly
(#728)
......
......@@ -237,9 +237,11 @@ MapsAdminPanel.prototype.projectToTableRow = function (project, row, user) {
row[4] = status;
var disabled = " disabled ";
if (user.hasPrivilege(self.getConfiguration().getPrivilegeType(PrivilegeType.PROJECT_MANAGEMENT))) {
if (user.hasPrivilege(self.getConfiguration().getPrivilegeType(PrivilegeType.PROJECT_MANAGEMENT))
&& (status.indexOf("Ok") === 0 || status.indexOf("Failure") === 0)) {
disabled = "";
}
row[5] = "<button name='showEditDialog' data='" + project.getProjectId() + "'" + disabled + "><i class='fa fa-edit' style='font-size:17px'></i></button>";
if (self.getConfiguration().getOption(ConfigurationType.DEFAULT_MAP).getValue() === projectId) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment