October 2014 - galaxy-commits - lists.galaxyproject.org

commit/galaxy-central: natefoo: Update tag latest_2014.10.06 for changeset 0f70d302b85e
by commits-noreply＠bitbucket.org 10 Oct '14

10 Oct '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ee1521d29ebf/ Changeset: ee1521d29ebf Branch: stable User: natefoo Date: 2014-10-10 14:00:19+00:00 Summary: Update tag latest_2014.10.06 for changeset 0f70d302b85e Affected #: 1 file diff -r 0f70d302b85e2a74d6c0c9ec7d4ccc6f11787eac -r ee1521d29ebf54cf16e44ae4f1d46e25a32fc297 .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -a4f8476d787e254f11735896d0a3d2dced86e10b latest_2014.10.06 +0f70d302b85e2a74d6c0c9ec7d4ccc6f11787eac latest_2014.10.06 Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: dannon: Merged in BjoernGruening/galaxy-central-5 (pull request #519)
by commits-noreply＠bitbucket.org 10 Oct '14

10 Oct '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a40dc4c1f075/ Changeset: a40dc4c1f075 User: dannon Date: 2014-10-10 13:58:18+00:00 Summary: Merged in BjoernGruening/galaxy-central-5 (pull request #519) Include cbx as new datatype, used by recent versions of cufftools. Affected #: 1 file diff -r 934dc228aeeed80e4973af32a3686ffb8ab5d624 -r a40dc4c1f075938eac42fd428e5fc7697560d751 config/datatypes_conf.xml.sample --- a/config/datatypes_conf.xml.sample +++ b/config/datatypes_conf.xml.sample @@ -43,6 +43,7 @@ <display file="ucsc/bigwig.xml" /><display file="igb/bigwig.xml" /></datatype> + <datatype extension="cxb" type="galaxy.datatypes.binary:Binary" mimetype="application/octet-stream" subclass="True" display_in_upload="true" description="Cuffquant output format" /><datatype extension="chrint" type="galaxy.datatypes.interval:ChromatinInteractions" display_in_upload="True"><converter file="interval_to_bgzip_converter.xml" target_datatype="bgzip"/><converter file="interval_to_tabix_converter.xml" target_datatype="tabix" depends_on="bgzip"/> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 10 Oct '14

10 Oct '14

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6f7356018ed9/ Changeset: 6f7356018ed9 User: BjoernGruening Date: 2014-10-08 13:58:34+00:00 Summary: Include cbx as new datatype used by recent versions of cufftools. Affected #: 1 file diff -r 0e99c30878af56e23f447854a7ae70b412a9d627 -r 6f7356018ed9311250c9a6c1a616e27e814ef954 config/datatypes_conf.xml.sample --- a/config/datatypes_conf.xml.sample +++ b/config/datatypes_conf.xml.sample @@ -43,6 +43,7 @@ <display file="ucsc/bigwig.xml" /><display file="igb/bigwig.xml" /></datatype> + <datatype extension="cxb" type="galaxy.datatypes.binary:Binary" mimetype="application/octet-stream" subclass="True" display_in_upload="true" description="Cuffquant output format" /><datatype extension="chrint" type="galaxy.datatypes.interval:ChromatinInteractions" display_in_upload="True"><converter file="interval_to_bgzip_converter.xml" target_datatype="bgzip"/><converter file="interval_to_tabix_converter.xml" target_datatype="tabix" depends_on="bgzip"/> https://bitbucket.org/galaxy/galaxy-central/commits/a40dc4c1f075/ Changeset: a40dc4c1f075 User: dannon Date: 2014-10-10 13:58:18+00:00 Summary: Merged in BjoernGruening/galaxy-central-5 (pull request #519) Include cbx as new datatype, used by recent versions of cufftools. Affected #: 1 file diff -r 934dc228aeeed80e4973af32a3686ffb8ab5d624 -r a40dc4c1f075938eac42fd428e5fc7697560d751 config/datatypes_conf.xml.sample --- a/config/datatypes_conf.xml.sample +++ b/config/datatypes_conf.xml.sample @@ -43,6 +43,7 @@ <display file="ucsc/bigwig.xml" /><display file="igb/bigwig.xml" /></datatype> + <datatype extension="cxb" type="galaxy.datatypes.binary:Binary" mimetype="application/octet-stream" subclass="True" display_in_upload="true" description="Cuffquant output format" /><datatype extension="chrint" type="galaxy.datatypes.interval:ChromatinInteractions" display_in_upload="True"><converter file="interval_to_bgzip_converter.xml" target_datatype="bgzip"/><converter file="interval_to_tabix_converter.xml" target_datatype="tabix" depends_on="bgzip"/> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: dannon: Merge stable changes.
by commits-noreply＠bitbucket.org 10 Oct '14

10 Oct '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/934dc228aeee/ Changeset: 934dc228aeee User: dannon Date: 2014-10-10 13:13:32+00:00 Summary: Merge stable changes. Affected #: 1 file diff -r 060d5e65f5c50709aa6139fe2c6fb64b263af7f1 -r 934dc228aeeed80e4973af32a3686ffb8ab5d624 .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -bde1c35ef8e53d0436507c48ed9b08b1dc5b06a3 latest_2014.10.06 +a4f8476d787e254f11735896d0a3d2dced86e10b latest_2014.10.06 Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: davebgx: More flexibility for tool data table configuration in the install and test framework.
by commits-noreply＠bitbucket.org 10 Oct '14

10 Oct '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/0f70d302b85e/ Changeset: 0f70d302b85e Branch: stable User: davebgx Date: 2014-10-09 18:17:33+00:00 Summary: More flexibility for tool data table configuration in the install and test framework. Affected #: 1 file diff -r 9bb2f032a455f0e63f407b396027102679d619ee -r 0f70d302b85e2a74d6c0c9ec7d4ccc6f11787eac test/install_and_test_tool_shed_repositories/base/util.py --- a/test/install_and_test_tool_shed_repositories/base/util.py +++ b/test/install_and_test_tool_shed_repositories/base/util.py @@ -115,13 +115,16 @@ additional_tool_data_tables = None additional_tool_data_path = None -# Set up default tool data tables. -if os.path.exists( 'tool_data_table_conf.xml' ): - tool_data_table_conf = 'tool_data_table_conf.xml' -elif os.path.exists( 'tool_data_table_conf.xml.sample' ): - tool_data_table_conf = 'tool_data_table_conf.xml.sample' -else: - tool_data_table_conf = None +tool_data_table_conf = None +# Set up default tool data tables. If a non-sample version is in config/, use that. Otherwise iterate through lower +# priority versions. +for conf in [ 'config/tool_data_table_conf.xml', + 'config/tool_data_table_conf.xml.sample', + 'tool_data_table_conf.xml', + 'tool_data_table_conf.xml.sample' ]: + if os.path.exists( conf ): + tool_data_table_conf = conf + break # The GALAXY_INSTALL_TEST_TOOL_SHED_URL and GALAXY_INSTALL_TEST_TOOL_SHED_API_KEY environment variables must be # set for this script to work correctly. If the value of GALAXY_INSTALL_TEST_TOOL_SHED_URL does not refer to one Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: natefoo: Update tag latest_2014.10.06 for changeset a4f8476d787e
by commits-noreply＠bitbucket.org 10 Oct '14

10 Oct '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9bb2f032a455/ Changeset: 9bb2f032a455 Branch: stable User: natefoo Date: 2014-10-10 13:00:38+00:00 Summary: Update tag latest_2014.10.06 for changeset a4f8476d787e Affected #: 1 file diff -r a4f8476d787e254f11735896d0a3d2dced86e10b -r 9bb2f032a455f0e63f407b396027102679d619ee .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -bde1c35ef8e53d0436507c48ed9b08b1dc5b06a3 latest_2014.10.06 +a4f8476d787e254f11735896d0a3d2dced86e10b latest_2014.10.06 Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: dannon: Merge from stable.
by commits-noreply＠bitbucket.org 10 Oct '14

10 Oct '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/060d5e65f5c5/ Changeset: 060d5e65f5c5 User: dannon Date: 2014-10-10 11:24:02+00:00 Summary: Merge from stable. Affected #: 3 files diff -r 5321b19715b144c7e93ae7567aa4a6681d3e59b7 -r 060d5e65f5c50709aa6139fe2c6fb64b263af7f1 .hgtags --- a/.hgtags +++ b/.hgtags @@ -19,3 +19,5 @@ 2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 +2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 +bde1c35ef8e53d0436507c48ed9b08b1dc5b06a3 latest_2014.10.06 diff -r 5321b19715b144c7e93ae7567aa4a6681d3e59b7 -r 060d5e65f5c50709aa6139fe2c6fb64b263af7f1 lib/galaxy/webapps/galaxy/api/libraries.py --- a/lib/galaxy/webapps/galaxy/api/libraries.py +++ b/lib/galaxy/webapps/galaxy/api/libraries.py @@ -39,7 +39,7 @@ .. seealso:: :attr:`galaxy.model.Library.dict_collection_visible_keys` """ - deleted = kwd.get( 'deleted', None ) + deleted = util.string_as_bool_or_none( kwd.get( 'deleted', None ) ) query = self.library_manager.list( trans, deleted ) libraries = [] for library in query: diff -r 5321b19715b144c7e93ae7567aa4a6681d3e59b7 -r 060d5e65f5c50709aa6139fe2c6fb64b263af7f1 lib/tool_shed/metadata/repository_metadata_manager.py --- a/lib/tool_shed/metadata/repository_metadata_manager.py +++ b/lib/tool_shed/metadata/repository_metadata_manager.py @@ -5,6 +5,7 @@ from galaxy import util from galaxy.util import inflector from galaxy.web.form_builder import SelectField +from galaxy.model.orm import or_ from tool_shed.metadata import metadata_generator from tool_shed.repository_types.metadata import TipOnly Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: martenson: fix a bug with parsing params in data libraries API introduced recently with refactoring into managers
by commits-noreply＠bitbucket.org 10 Oct '14

10 Oct '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a4f8476d787e/ Changeset: a4f8476d787e Branch: stable User: martenson Date: 2014-10-10 00:36:54+00:00 Summary: fix a bug with parsing params in data libraries API introduced recently with refactoring into managers Affected #: 1 file diff -r ff30da7a2873416a332b7700eb15e26a1bf3c46e -r a4f8476d787e254f11735896d0a3d2dced86e10b lib/galaxy/webapps/galaxy/api/libraries.py --- a/lib/galaxy/webapps/galaxy/api/libraries.py +++ b/lib/galaxy/webapps/galaxy/api/libraries.py @@ -39,7 +39,7 @@ .. seealso:: :attr:`galaxy.model.Library.dict_collection_visible_keys` """ - deleted = kwd.get( 'deleted', None ) + deleted = util.string_as_bool_or_none( kwd.get( 'deleted', None ) ) query = self.library_manager.list( trans, deleted ) libraries = [] for library in query: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: guerler: ToolForm: Fix link shown for tool sharing
by commits-noreply＠bitbucket.org 09 Oct '14

09 Oct '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/5321b19715b1/ Changeset: 5321b19715b1 User: guerler Date: 2014-10-10 04:11:21+00:00 Summary: ToolForm: Fix link shown for tool sharing Affected #: 3 files diff -r 10b4f2107e90f3821f94be4286f320628c518034 -r 5321b19715b144c7e93ae7567aa4a6681d3e59b7 client/galaxy/scripts/mvc/tools/tools-form.js --- a/client/galaxy/scripts/mvc/tools/tools-form.js +++ b/client/galaxy/scripts/mvc/tools/tools-form.js @@ -158,7 +158,7 @@ title : 'Share', tooltip : 'Share this tool', onclick : function() { - prompt('Copy to clipboard: Ctrl+C, Enter', galaxy_config.root + 'root?tool_id=' + self.options.id); + prompt('Copy to clipboard: Ctrl+C, Enter', window.location.origin + galaxy_config.root + 'root?tool_id=' + self.options.id); } }); diff -r 10b4f2107e90f3821f94be4286f320628c518034 -r 5321b19715b144c7e93ae7567aa4a6681d3e59b7 static/scripts/mvc/tools/tools-form.js --- a/static/scripts/mvc/tools/tools-form.js +++ b/static/scripts/mvc/tools/tools-form.js @@ -158,7 +158,7 @@ title : 'Share', tooltip : 'Share this tool', onclick : function() { - prompt('Copy to clipboard: Ctrl+C, Enter', galaxy_config.root + 'root?tool_id=' + self.options.id); + prompt('Copy to clipboard: Ctrl+C, Enter', window.location.origin + galaxy_config.root + 'root?tool_id=' + self.options.id); } }); diff -r 10b4f2107e90f3821f94be4286f320628c518034 -r 5321b19715b144c7e93ae7567aa4a6681d3e59b7 static/scripts/packed/mvc/tools/tools-form.js --- a/static/scripts/packed/mvc/tools/tools-form.js +++ b/static/scripts/packed/mvc/tools/tools-form.js @@ -1,1 +1,1 @@ -define(["utils/utils","mvc/ui/ui-portlet","mvc/ui/ui-misc","mvc/citation/citation-model","mvc/citation/citation-view","mvc/tools","mvc/tools/tools-template","mvc/tools/tools-content","mvc/tools/tools-section","mvc/tools/tools-tree","mvc/tools/tools-jobs"],function(j,i,m,k,a,f,d,g,l,c,h){var e=Backbone.Model.extend({initialize:function(n){this.url=galaxy_config.root+"api/tools/"+n.id+"?io_details=true"}});var b=Backbone.View.extend({container:"body",initialize:function(o){var n=this;if(parent.Galaxy&&parent.Galaxy.modal){this.modal=parent.Galaxy.modal}else{this.modal=new m.Modal.View()}this.options=o;this.setElement("<div/>");$(this.container).append(this.$el);this.model=new e({id:o.id});this.tree=new c(this);this.job_handler=new h(this);this.field_list={};this.input_list={};this.element_list={};this.content=new g({history_id:this.options.history_id,success:function(){n._initializeToolForm()}})},message:function(n){$(this.container).empty();$(this.container).append(n)},reset:function(){for(var n in this.element_list){this.element_list[n].reset()}},refresh:function(){this.tree.refresh();for(var n in this.field_list){this.field_list[n].trigger("change")}console.debug("tools-form::refresh() - Recreated data structure. Refresh.")},_initializeToolForm:function(){var n=this;this.model.fetch({error:function(o){console.debug("tools-form::_initializeToolForm() : Attempt to fetch tool model failed.")},success:function(){n.inputs=n.model.get("inputs");if(n.options.job_id){j.get({url:galaxy_config.root+"api/jobs/"+n.options.job_id,success:function(o){n._buildForm()}})}else{n._buildForm()}}})},_buildForm:function(){var p=this;var r=new m.ButtonIcon({icon:"fa-question-circle",title:"Question?",tooltip:"Ask a question about this tool (Biostar)",onclick:function(){window.open(p.options.biostar_url+"/p/new/post/")}});var s=new m.ButtonIcon({icon:"fa-search",title:"Search",tooltip:"Search help for this tool (Biostar)",onclick:function(){window.open(p.options.biostar_url+"/t/"+p.options.id+"/")}});var n=new m.ButtonIcon({icon:"fa-share",title:"Share",tooltip:"Share this tool",onclick:function(){prompt("Copy to clipboard: Ctrl+C, Enter",galaxy_config.root+"root?tool_id="+p.options.id)}});var q={button_question:r,button_search:s,button_share:n};if(Galaxy.currUser.get("is_admin")){q.button_download=new m.ButtonIcon({icon:"fa-download",title:"Download",tooltip:"Download this tool",onclick:function(){window.location.href=galaxy_config.root+"api/tools/"+p.options.id+"/download"}})}this.section=new l.View(p,{inputs:this.inputs,cls:"ui-table-plain"});if(this.incompatible){this.$el.hide();$("#tool-form-classic").show();return}this.portlet=new i.View({icon:"fa-wrench",title:"<b>"+this.model.get("name")+"</b> "+this.model.get("description"),operations:q,buttons:{execute:new m.Button({icon:"fa-check",tooltip:"Execute the tool",title:"Execute",cls:"btn btn-primary",floating:"clear",onclick:function(){p.job_handler.submit()}})}});if(!this.options.biostar_url){r.$el.hide();s.$el.hide()}this.$el.append(this.portlet.$el);if(this.options.help!=""){this.$el.append(d.help(this.options.help))}if(this.options.citations){this.$el.append(d.citations());var o=new k.ToolCitationCollection();o.tool_id=this.options.id;var t=new a.CitationListView({collection:o});t.render();o.fetch()}this.portlet.append(this.section.$el);this.refresh()}});return{View:b}}); \ No newline at end of file +define(["utils/utils","mvc/ui/ui-portlet","mvc/ui/ui-misc","mvc/citation/citation-model","mvc/citation/citation-view","mvc/tools","mvc/tools/tools-template","mvc/tools/tools-content","mvc/tools/tools-section","mvc/tools/tools-tree","mvc/tools/tools-jobs"],function(j,i,m,k,a,f,d,g,l,c,h){var e=Backbone.Model.extend({initialize:function(n){this.url=galaxy_config.root+"api/tools/"+n.id+"?io_details=true"}});var b=Backbone.View.extend({container:"body",initialize:function(o){var n=this;if(parent.Galaxy&&parent.Galaxy.modal){this.modal=parent.Galaxy.modal}else{this.modal=new m.Modal.View()}this.options=o;this.setElement("<div/>");$(this.container).append(this.$el);this.model=new e({id:o.id});this.tree=new c(this);this.job_handler=new h(this);this.field_list={};this.input_list={};this.element_list={};this.content=new g({history_id:this.options.history_id,success:function(){n._initializeToolForm()}})},message:function(n){$(this.container).empty();$(this.container).append(n)},reset:function(){for(var n in this.element_list){this.element_list[n].reset()}},refresh:function(){this.tree.refresh();for(var n in this.field_list){this.field_list[n].trigger("change")}console.debug("tools-form::refresh() - Recreated data structure. Refresh.")},_initializeToolForm:function(){var n=this;this.model.fetch({error:function(o){console.debug("tools-form::_initializeToolForm() : Attempt to fetch tool model failed.")},success:function(){n.inputs=n.model.get("inputs");if(n.options.job_id){j.get({url:galaxy_config.root+"api/jobs/"+n.options.job_id,success:function(o){n._buildForm()}})}else{n._buildForm()}}})},_buildForm:function(){var p=this;var r=new m.ButtonIcon({icon:"fa-question-circle",title:"Question?",tooltip:"Ask a question about this tool (Biostar)",onclick:function(){window.open(p.options.biostar_url+"/p/new/post/")}});var s=new m.ButtonIcon({icon:"fa-search",title:"Search",tooltip:"Search help for this tool (Biostar)",onclick:function(){window.open(p.options.biostar_url+"/t/"+p.options.id+"/")}});var n=new m.ButtonIcon({icon:"fa-share",title:"Share",tooltip:"Share this tool",onclick:function(){prompt("Copy to clipboard: Ctrl+C, Enter",window.location.origin+galaxy_config.root+"root?tool_id="+p.options.id)}});var q={button_question:r,button_search:s,button_share:n};if(Galaxy.currUser.get("is_admin")){q.button_download=new m.ButtonIcon({icon:"fa-download",title:"Download",tooltip:"Download this tool",onclick:function(){window.location.href=galaxy_config.root+"api/tools/"+p.options.id+"/download"}})}this.section=new l.View(p,{inputs:this.inputs,cls:"ui-table-plain"});if(this.incompatible){this.$el.hide();$("#tool-form-classic").show();return}this.portlet=new i.View({icon:"fa-wrench",title:"<b>"+this.model.get("name")+"</b> "+this.model.get("description"),operations:q,buttons:{execute:new m.Button({icon:"fa-check",tooltip:"Execute the tool",title:"Execute",cls:"btn btn-primary",floating:"clear",onclick:function(){p.job_handler.submit()}})}});if(!this.options.biostar_url){r.$el.hide();s.$el.hide()}this.$el.append(this.portlet.$el);if(this.options.help!=""){this.$el.append(d.help(this.options.help))}if(this.options.citations){this.$el.append(d.citations());var o=new k.ToolCitationCollection();o.tool_id=this.options.id;var t=new a.CitationListView({collection:o});t.render();o.fetch()}this.portlet.append(this.section.$el);this.refresh()}});return{View:b}}); \ No newline at end of file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: guerler: ToolForm: Fix optional label, add file
by commits-noreply＠bitbucket.org 09 Oct '14

09 Oct '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/10b4f2107e90/ Changeset: 10b4f2107e90 User: guerler Date: 2014-10-10 04:03:59+00:00 Summary: ToolForm: Fix optional label, add file Affected #: 3 files diff -r 34e643839cdace531f6ebf1a7d08e5d735be51a6 -r 10b4f2107e90f3821f94be4286f320628c518034 client/galaxy/scripts/mvc/tools/tools-input.js --- /dev/null +++ b/client/galaxy/scripts/mvc/tools/tools-input.js @@ -0,0 +1,108 @@ +/** + This class creates a tool form input element wrapper +*/ +define([], function() { + + // input field element wrapper + return Backbone.View.extend({ + // initialize input wrapper + initialize: function(options) { + // link field + this.field = options.field; + + // set element + this.setElement(this._template(options)); + + // link elements + this.$field = this.$el.find('.ui-table-form-field'); + this.$title_optional = this.$el.find('.ui-table-form-title-optional'); + this.$error_text = this.$el.find('.ui-table-form-error-text'); + this.$error = this.$el.find('.ui-table-form-error'); + + // add field element + this.$field.prepend(this.field.$el); + + // hide optional field on initialization + if (options.optional) { + this.field.skip = true; + } else { + this.field.skip = false; + } + + // refresh view + this._refresh(); + + // add optional hide/show + var self = this; + this.$title_optional.on('click', function() { + // flip flag + self.field.skip = !self.field.skip; + + // refresh view + self._refresh(); + }); + }, + + /** Set error text + */ + error: function(text) { + this.$error_text.html(text); + this.$error.fadeIn(); + this.$el.addClass('ui-error'); + }, + + /** Reset this view + */ + reset: function() { + this.$error.hide(); + this.$el.removeClass('ui-error'); + }, + + /** Refresh element + */ + _refresh: function() { + // show/hide field element + if (!this.field.skip) { + this.$field.fadeIn('fast'); + this.$title_optional.html('Disable'); + } else { + this.$field.hide(); + this.$title_optional.html('Enable'); + } + }, + + /** Main Template + */ + _template: function(options) { + // create table element + var tmp = '<div class="ui-table-form-element">' + + '<div class="ui-table-form-error ui-error">' + + '<span class="fa fa-arrow-down"/><span class="ui-table-form-error-text"/>' + + '</div>' + + '<div class="ui-table-form-title-strong">'; + + // is optional + if (options.optional) { + tmp += 'Optional: ' + options.label + + '<span>&nbsp[<span class="ui-table-form-title-optional"/>]</span>'; + } else { + tmp += options.label; + } + + // finalize title + tmp += '</div>' + + '<div class="ui-table-form-field">'; + // add help + if (options.help) { + tmp += '<div class="ui-table-form-info">' + options.help + '</div>'; + } + + // finalize + tmp += '</div>' + + '</div>'; + + // return input element + return tmp; + } + }); +}); diff -r 34e643839cdace531f6ebf1a7d08e5d735be51a6 -r 10b4f2107e90f3821f94be4286f320628c518034 static/scripts/mvc/tools/tools-input.js --- a/static/scripts/mvc/tools/tools-input.js +++ b/static/scripts/mvc/tools/tools-input.js @@ -83,7 +83,7 @@ // is optional if (options.optional) { - tmp += '*Optional: ' + options.label + + tmp += 'Optional: ' + options.label + '<span>&nbsp[<span class="ui-table-form-title-optional"/>]</span>'; } else { tmp += options.label; diff -r 34e643839cdace531f6ebf1a7d08e5d735be51a6 -r 10b4f2107e90f3821f94be4286f320628c518034 static/scripts/packed/mvc/tools/tools-input.js --- a/static/scripts/packed/mvc/tools/tools-input.js +++ b/static/scripts/packed/mvc/tools/tools-input.js @@ -1,1 +1,1 @@ -define([],function(){return Backbone.View.extend({initialize:function(b){this.field=b.field;this.setElement(this._template(b));this.$field=this.$el.find(".ui-table-form-field");this.$title_optional=this.$el.find(".ui-table-form-title-optional");this.$error_text=this.$el.find(".ui-table-form-error-text");this.$error=this.$el.find(".ui-table-form-error");this.$field.prepend(this.field.$el);if(b.optional){this.field.skip=true}else{this.field.skip=false}this._refresh();var a=this;this.$title_optional.on("click",function(){a.field.skip=!a.field.skip;a._refresh()})},error:function(a){this.$error_text.html(a);this.$error.fadeIn();this.$el.addClass("ui-error")},reset:function(){this.$error.hide();this.$el.removeClass("ui-error")},_refresh:function(){if(!this.field.skip){this.$field.fadeIn("fast");this.$title_optional.html("Disable")}else{this.$field.hide();this.$title_optional.html("Enable")}},_template:function(a){var b='<div class="ui-table-form-element"><div class="ui-table-form-error ui-error"><span class="fa fa-arrow-down"/><span class="ui-table-form-error-text"/></div><div class="ui-table-form-title-strong">';if(a.optional){b+="*Optional: "+a.label+'<span>&nbsp[<span class="ui-table-form-title-optional"/>]</span>'}else{b+=a.label}b+='</div><div class="ui-table-form-field">';if(a.help){b+='<div class="ui-table-form-info">'+a.help+"</div>"}b+="</div></div>";return b}})}); \ No newline at end of file +define([],function(){return Backbone.View.extend({initialize:function(b){this.field=b.field;this.setElement(this._template(b));this.$field=this.$el.find(".ui-table-form-field");this.$title_optional=this.$el.find(".ui-table-form-title-optional");this.$error_text=this.$el.find(".ui-table-form-error-text");this.$error=this.$el.find(".ui-table-form-error");this.$field.prepend(this.field.$el);if(b.optional){this.field.skip=true}else{this.field.skip=false}this._refresh();var a=this;this.$title_optional.on("click",function(){a.field.skip=!a.field.skip;a._refresh()})},error:function(a){this.$error_text.html(a);this.$error.fadeIn();this.$el.addClass("ui-error")},reset:function(){this.$error.hide();this.$el.removeClass("ui-error")},_refresh:function(){if(!this.field.skip){this.$field.fadeIn("fast");this.$title_optional.html("Disable")}else{this.$field.hide();this.$title_optional.html("Enable")}},_template:function(a){var b='<div class="ui-table-form-element"><div class="ui-table-form-error ui-error"><span class="fa fa-arrow-down"/><span class="ui-table-form-error-text"/></div><div class="ui-table-form-title-strong">';if(a.optional){b+="Optional: "+a.label+'<span>&nbsp[<span class="ui-table-form-title-optional"/>]</span>'}else{b+=a.label}b+='</div><div class="ui-table-form-field">';if(a.help){b+='<div class="ui-table-form-info">'+a.help+"</div>"}b+="</div></div>";return b}})}); \ No newline at end of file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0