opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate 'edit_complete.tmpl' and use the generic 'show_message' instead.

Browse Source 
Fix some comment formatting.
This commit is contained in:
James Taylor
2008-04-25 17:00:36 +00:00
parent 2e45325b9b
commit db3db09f86
2 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/root.py
+7 -8
View File
@@ -187,15 +187,15 @@ class Universe( BaseController ):
p = util.Params(kwd, safe=False)
if p.change:
"""The user clicked the Save button on the 'Change data type' form"""
# The user clicked the Save button on the 'Change data type' form
trans.app.datatypes_registry.change_datatype( data, p.datatype )
trans.app.model.flush()
elif p.save:
"""The user clicked the Save button on the 'Edit Attributes' form"""
# The user clicked the Save button on the 'Edit Attributes' form
data.name = p.name
data.info = p.info
"""The following for loop will save all metadata_spec items"""
# The following for loop will save all metadata_spec items
for name, spec in data.datatype.metadata_spec.items():
if spec.get("readonly"):
continue
@@ -208,9 +208,9 @@ class Universe( BaseController ):
data.datatype.after_edit( data )
trans.app.model.flush()
return trans.fill_template( "edit_complete.tmpl" )
return trans.show_ok_message( "Attributes updated", refresh_frames=['history'] )
elif p.detect:
"""The user clicked the Auto-detect button on the 'Edit Attributes' form"""
# The user clicked the Auto-detect button on the 'Edit Attributes' form
for name, spec in data.datatype.metadata_spec.items():
# We need to be careful about the attributes we are resetting
if name != 'name' and name != 'info' and name != 'dbkey':
@@ -219,14 +219,13 @@ class Universe( BaseController ):
data.datatype.set_meta( data )
data.datatype.after_edit( data )
trans.app.model.flush()
return trans.fill_template( "edit_complete.tmpl" )
return trans.show_ok_message( "Attributes updated", refresh_frames=['history'] )
elif p.convert_data:
"""The user clicked the Convert button on the 'Convert to new format' form"""
target_type = kwd.get("target_type", None)
if target_type:
msg = data.datatype.convert_dataset(trans, data, target_type)
return trans.fill_template( "edit_complete.tmpl", msg=msg )
return trans.show_ok_message( msg, refresh_frames=['history'] )
data.datatype.before_edit( data )
if "dbkey" in data.datatype.metadata_spec and not data.metadata.dbkey:
templates/edit_complete.tmpl
-23
View File
@@ -1,23 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title>Galaxy</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link href="$h.url_for('/static/style/base.css')" rel="stylesheet" type="text/css" />
<script type="text/javascript">
if ( parent.frames && parent.frames.galaxy_history )
{
parent.frames.galaxy_history.location.reload();
}
</script>
</head>
<body>
<div class="donemessage">
#if $getVar( 'msg', None )
$msg
#else
Attributes changed.
#end if
</div>
</body>
</html>