2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/e53f0a6bebd4/ changeset: e53f0a6bebd4 user: jgoecks date: 2012-10-23 00:34:31 summary: Enable icon buttons to generate popup menus. affected #: 1 file diff -r 97816731e24bff2d825c7713787df2b0f2fc445f -r e53f0a6bebd4fd39b7e84671fcc7cd71889ea882 static/scripts/mvc/ui.js --- a/static/scripts/mvc/ui.js +++ b/static/scripts/mvc/ui.js @@ -14,6 +14,7 @@ title: "", icon_class: "", on_click: null, + menu_options: null, tooltip_config: {}, isMenuButton : true, @@ -52,7 +53,7 @@ this.$el.replaceWith( newElem ); this.setElement( newElem ); - + return this; }, @@ -106,6 +107,13 @@ if (button.attributes.tooltip_config) { elt.tooltip(button.attributes.tooltip_config); } + + // If there are options, add popup menu to icon. + var menu_options = button.get('options'); + if (menu_options) { + make_popupmenu(elt, menu_options); + } + }); return this; } https://bitbucket.org/galaxy/galaxy-central/changeset/f64b134738a9/ changeset: f64b134738a9 user: jgoecks date: 2012-10-23 00:35:54 summary: Automated merge affected #: 2 files diff -r e53f0a6bebd4fd39b7e84671fcc7cd71889ea882 -r f64b134738a929a05481d30c3135b7663f7f806d lib/galaxy/webapps/galaxy/api/folder_contents.py --- a/lib/galaxy/webapps/galaxy/api/folder_contents.py +++ b/lib/galaxy/webapps/galaxy/api/folder_contents.py @@ -59,7 +59,7 @@ # TODO: Find the API's path to this folder if necessary. # This was needed in recursive descent, but it's not needed # for "ls"-style content checking: - if not folder or not ( trans.user_is_admin() or trans.app.security_agent.can_access_library_item( current_user_roles, folder ) ): + if not folder or not ( trans.user_is_admin() or trans.app.security_agent.can_access_library_item( current_user_roles, folder, trans.user ) ): trans.response.status = 400 return "Invalid folder id ( %s ) specified." % str( folder_id ) diff -r e53f0a6bebd4fd39b7e84671fcc7cd71889ea882 -r f64b134738a929a05481d30c3135b7663f7f806d lib/galaxy/webapps/galaxy/api/folders.py --- a/lib/galaxy/webapps/galaxy/api/folders.py +++ b/lib/galaxy/webapps/galaxy/api/folders.py @@ -50,7 +50,6 @@ moved here. o payload's relevant params: - - create_type: "file" or "folder" (required) - folder_id: This is the parent folder's id (required) """ log.debug( "FoldersController.create: enter" ) 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.