opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-13 00:44:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_18.01' into dev

Browse Source
This commit is contained in:
Nicola Soranzo
2018-02-20 11:05:31 +00:00
parent 49a8a317e8 6a3ce34c09
commit 3cf84ea3da
3 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/history/hdca-li-edit.js
+3 -3
View File
@@ -40,17 +40,17 @@ var HDCAListItemEdit = _super.extend(
</a>
<ul class="dropdown-menu pull-right" role="menu">
<li>
<a href="" class="delete-collection">
<a href="#" class="delete-collection">
${_l("Collection Only")}
</a>
</li>
<li>
<a href="" class="delete-collection-and-datasets">
<a href="#" class="delete-collection-and-datasets">
${_l("Delete Datasets")}
</a>
</li>
<li style="display: ${this.purgeAllowed ? "inherit" : "none"}">
<a href="" class="delete-collection-and-purge-datasets">
<a href="#" class="delete-collection-and-purge-datasets">
${_l("Permanently Delete Datasets")}
</a>
</li>
client/galaxy/scripts/mvc/history/history-view-edit.js
+6 -1
View File
@@ -275,7 +275,12 @@ var HistoryViewEdit = _super.extend(
func: function() {
if (confirm(_l("This will permanently remove the data in your datasets. Are you sure?"))) {
var action = HDA_MODEL.HistoryDatasetAssociation.prototype.purge;
panel.getSelectedModels().ajaxQueue(action);
const historyContents = panel.getSelectedModels();
const selectedDatasets = historyContents.filter(
c =>
c.get("history_content_type") == "dataset"
)
historyContents.ajaxQueue(action, {}, selectedDatasets);
}
}
});
lib/galaxy/auth/providers/ldap_ad.py
+16 -19
View File
@@ -25,7 +25,7 @@ def _get_subs(d, k, params):
return str(d[k]).format(**params)
def _parse_ldap_options(ldap, options_unparsed):
def _parse_ldap_options(options_unparsed):
# Tag is defined in the XML but is empty
if not options_unparsed:
return []
@@ -42,26 +42,23 @@ def _parse_ldap_options(ldap, options_unparsed):
log.warning("LDAP authenticate: Invalid syntax '%s' inside <ldap-options> element. Syntax should be option1=value1,option2=value2" % opt)
continue
if not key.startswith(prefix):
log.warning("LDAP authenticate: Invalid LDAP option '%s'. '%s' doesn't start with prefix '%s'", opt, key, prefix)
continue
try:
pair = []
for n in (key, value):
if not n.startswith(prefix):
raise ValueError
name = getattr(ldap, n)
pair.append(name)
except ValueError:
log.warning("LDAP authenticate: Invalid parameter pair %s=%s. '%s' doesn't start with prefix %s", key, value, n, prefix)
continue
key = getattr(ldap, key)
except AttributeError:
log.warning("LDAP authenticate: Invalid parameter pair %s=%s. '%s' is not available in module ldap", key, value, n)
log.warning("LDAP authenticate: Invalid LDAP option '%s'. '%s' is not available in module ldap", opt, key)
continue
else:
log.debug("LDAP authenticate: Valid LDAP option pair %s=%s -> %s=%s", key, value, *pair)
ldap_options.append(pair)
if value.startswith(prefix):
try:
value = getattr(ldap, value)
except AttributeError:
log.warning("LDAP authenticate: Invalid LDAP option '%s'. '%s' is not available in module ldap", opt, value)
continue
pair = (key, value)
log.debug("LDAP authenticate: Valid LDAP option pair '%s' -> '%s=%s'", opt, *pair)
ldap_options.append(pair)
return ldap_options
@@ -128,7 +125,7 @@ class LDAP(AuthProvider):
except ConfigurationError:
ldap_options = ()
else:
ldap_options = _parse_ldap_options(ldap, ldap_options_raw)
ldap_options = _parse_ldap_options(ldap_options_raw)
try:
# setup connection