Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master

app/assets/javascripts/design/radio.js

@@ -76,7 +76,8 @@ function changeRadioStart(el) {
       }
 
       el.next().bind("mousedown", function(e) {
-        changeRadio($(this)) 
+        changeRadio($(this));
+        $(this).find("input:radio").change();
       });
       if($.browser.msie) {
         el.next().find("input").eq(0).bind("click", function(e) {

app/controllers/issues_controller.rb

@@ -3,15 +3,13 @@ class IssuesController < ApplicationController
   NON_RESTFUL_ACTION = [:create_label, :update_label, :destroy_label, :search_collaborators]
   before_filter :authenticate_user!
 
-  load_and_authorize_resource :project, :except => NON_RESTFUL_ACTION
+  load_resource :project
-  load_and_authorize_resource :issue, :through => :project, :find_by => :serial_id, :only => [:show, :edit, :update, :destroy]
+  load_and_authorize_resource :issue, :through => :project, :find_by => :serial_id, :only => [:show, :edit, :update, :destroy, :new, :create]
   before_filter :load_and_authorize_label, :only => NON_RESTFUL_ACTION
 
   layout 'application'
 
   def index(status = 200)
-    logger.debug "!!!!!!!!!!!!!!!!!!"
-    logger.debug "request format is #{request.format}"
     @is_assigned_to_me = params[:filter] == 'to_me'
     @status = params[:status] == 'closed' ? 'closed' : 'open'
     @labels = params[:labels] || []
@@ -36,17 +34,16 @@ class IssuesController < ApplicationController
   end
 
   def new
-    @issue = Issue.new(:project => @project)
+    @issue = @project.issues.new
   end
 
   def create
     @user_id = params[:user_id]
     @user_uname = params[:user_uname]
 
-    @issue = Issue.new(params[:issue])
+    @issue = @project.issues.new(params[:issue])
     @issue.creator_id = current_user.id
     @issue.user_id = @user_id
-    @issue.project_id = @project.id
 
     if @issue.save
       @issue.subscribe_creator(current_user.id)
@@ -67,9 +64,7 @@ class IssuesController < ApplicationController
       status = 200 if @issue.save
       render action, :status => (status || 500), :layout => false
     else
-      @issue.title = params[:issue][:title]
+      status = 200 if @issue.update_attributes(params[:issue])
-      @issue.body = params[:issue][:body]
-      status = 200 if @issue.save
       render :nothing => true, :status => (status || 500), :layout => false
     end
   end
@@ -112,7 +107,6 @@ class IssuesController < ApplicationController
   private
 
   def load_and_authorize_label
-    @project = Project.find(params[:project_id])
     @label = Label.find(params[:label_id]) if params[:label_id]
     authorize! :write, @project
   end

app/models/issue.rb

@@ -20,7 +20,7 @@ class Issue < ActiveRecord::Base
   after_create :subscribe_users
   after_update :subscribe_issue_assigned_user
 
-  attr_accessible :labelings_attributes, :title, :body, :project, :project_id, :closed_at, :closed_by
+  attr_accessible :labelings_attributes, :title, :body
   accepts_nested_attributes_for :labelings, :allow_destroy => true
 
   scope :opened, where(:status => 'open', :closed_by => nil, :closed_at => nil)

app/views/issues/_index_sidebar.html.haml

@@ -16,5 +16,5 @@
       =tracker_search_field(:search_issue, t('layout.issues.search'))
   .bordered.nopadding
     %h3.bmargin10=t('layout.issues.new')
-    = link_to t("layout.add"), new_project_issue_path(@project), :class => 'button' if can? :new, Issue.new(:project_id => @project.id)
+    = link_to t("layout.add"), new_project_issue_path(@project), :class => 'button' if can? :new, @project.issues.new
   =render :partial => 'labels'

app/views/projects/new.html.haml

@@ -1,5 +1,3 @@
-= render :partial => 'projects/submenu'
-
 %h3.bpadding10
   = t("layout.projects.new_header")
 

spec/controllers/issues_controller_spec.rb

@@ -27,7 +27,7 @@ end
 shared_examples_for 'user with issue update rights' do
   it 'should be able to perform update action' do
     put :update, {:id => @issue.serial_id}.merge(@update_params)
-    response.should redirect_to([@project, @issue])
+    response.code.should eq('200')
   end
 
   it 'should update issue title' do