@@ -1,3 +1,9 @@ +* 1.1.6 + +* Rake 0.8 compatibility fix +* Fix bug with import_users task +* Fix issues with bad permissions URLs. + * 1.1.5 * Add SVN Annotation/Blame support CHANGELOG @@ -6,9 +6,9 @@ class PermissionsController < ApplicationController before_filter :load_all_repositories, :only => [:index, :create] def index - @permission ||= Permission.new - @invitees = User.find(:all, :order => 'login, email') - @members = current_repository.permissions.group_by &:user + @permission = Permission.new + @invitees = User.find(:all, :order => 'login, email') + @members = current_repository.permissions.group_by &:user @invitees.delete_if { |i| @members.keys.include?(i) } render :action => 'index' end app/controllers/permissions_controller.rb @@ -27,6 +27,7 @@ <%= yield :onready %> }); <%= yield :javascript %> + <% if USE_REPO_PATHS && current_repository -%>Warehouse.root = '/<%= current_repository.subdomain %>';<% end -%> </script> <%= auto_discovery_link_tag(:atom, changeset_feed_url) %> <!--[if lt IE 8]> app/views/layouts/application.html.erb @@ -28,7 +28,7 @@ <% end -%> </ul> - <% sheet_form_for @permission, :html => { :id => 'add-member' }, :trigger => 'addperm' do |s| -%> + <% sheet_form_for @permission, :url => hosted_url(:permissions), :html => { :id => 'add-member' }, :trigger => 'addperm' do |s| -%> <h2>Add a new Subversion permission</h2> <%= s.select "Permissions for", :user_id, invitee_options_for(@invitees) %> <%= s.check_box 'Administrator', 'Yes, this user can add and delete members.', :admin %> app/views/permissions/index.html.erb @@ -1,18 +1,20 @@ - +var Warehouse = { + root: '' +} Permissions = { removeMember: function(user_id) { if(!confirm("Are you sure you wish to remove this member?")) return if(user_id == 'anon') - new Ajax.Request("/permissions/anon", {method:'delete'}); + new Ajax.Request(Warehouse.root + "/admin/permissions/anon", {method:'delete'}); else - new Ajax.Request("/users/" + user_id + "/permissions", {method:'delete'}); + new Ajax.Request(Warehouse.root + "/admin/users/" + user_id + "/permissions", {method:'delete'}); }, remove: function(line) { if(line.readAttribute('id')) { if(!confirm("Are you sure you wish to remove this permission?")) return; - new Ajax.Request("/permissions/" + line.readAttribute('id').match(/(\d+)$/)[0], {method:'delete'}); + new Ajax.Request(Warehouse.root + "/admin/permissions/" + line.readAttribute('id').match(/(\d+)$/)[0], {method:'delete'}); } else { line.remove(); } @@ -52,7 +54,7 @@ Importer.prototype = { step: function(progress) { if(this.firstRun) progress = this.options.get('startProgress'); if(progress < 100) { - new Ajax.Request('/admin/repositories/' + this.repoId + '/sync', { + new Ajax.Request(Warehouse.root + '/admin/repositories/' + this.repoId + '/sync', { method: 'post', onSuccess: function(transport) { this.firstRun = false; public/javascripts/application.js a36c6f0259d3f00792e9d84b56696528ea8a97bb rick technoweenie@gmail.com http://github.com/entp/warehouse/commit/e56c8d120866b1fda63ed660f4d2f980c7354207 e56c8d120866b1fda63ed660f4d2f980c7354207 2008-01-21T23:19:38-08:00 2008-01-21T23:19:38-08:00 fix pesky permissions issuse 8bc9b0d18f2ea001400d226145a6e80dc242494d rick technoweenie@gmail.com