Milestone basic scaffold

app/controllers/issues_controller.rb

@@ -15,7 +15,7 @@ class IssuesController < ApplicationController
   before_filter :authorize_write_issue!, :only => [:new, :create]
 
   # Allow modify issue
-  before_filter :authorize_modify_issue!, :only => [:close, :edit, :update, :sort]
+  before_filter :authorize_modify_issue!, :only => [:close, :edit, :update]
 
   # Allow destroy issue
   before_filter :authorize_admin_issue!, :only => [:destroy]
@@ -28,8 +28,10 @@ class IssuesController < ApplicationController
               when 2 then @project.issues.closed
               when 3 then @project.issues.opened.assigned(current_user)
               else @project.issues.opened
-              end.page(params[:page]).per(20)
+              end
 
+    @issues = @issues.where(:milestone_id => params[:milestone_id]) if params[:milestone_id].present?
+    @issues = @issues.page(params[:page]).per(20)
     @issues = @issues.includes(:author, :project).order("critical, updated_at")
 
     respond_to do |format|
@@ -51,13 +53,6 @@ class IssuesController < ApplicationController
   def show
     @note = @project.notes.new(:noteable => @issue)
 
-    @commits = if @issue.branch_name && @project.repo.heads.map(&:name).include?(@issue.branch_name)
-                 @project.repo.commits_between("master", @issue.branch_name)
-               else 
-                 []
-               end
-
-
     respond_to do |format|
       format.html
       format.js
@@ -102,6 +97,8 @@ class IssuesController < ApplicationController
   end
 
   def sort
+    return render_404 unless can?(current_user, :admin_issue, @project)
+
     @issues = @project.issues.where(:id => params['issue'])
     @issues.each do |issue|
       issue.position = params['issue'].index(issue.id.to_s) + 1

app/controllers/milestones_controller.rb

@@ -0,0 +1,94 @@
+class MilestonesController < ApplicationController
+  before_filter :authenticate_user!
+  before_filter :project
+  before_filter :module_enabled
+  before_filter :milestone, :only => [:edit, :update, :destroy, :show]
+  layout "project"
+
+  # Authorize
+  before_filter :add_project_abilities
+
+  # Allow read any milestone
+  before_filter :authorize_read_milestone!
+
+  # Allow admin milestone
+  before_filter :authorize_admin_milestone!, :except => [:index, :show]
+
+  respond_to :html
+
+  def index
+    @milestones = case params[:f].to_i
+                  when 1; @project.milestones
+                  else @project.milestones.active
+                  end
+
+    @milestones = @milestones.includes(:project).order("due_date")
+    @milestones = @milestones.page(params[:page]).per(20)
+  end
+
+  def new
+    @milestone = @project.milestones.new
+    respond_with(@milestone)
+  end
+
+  def edit
+    respond_with(@milestone)
+  end
+
+  def show
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def create
+    @milestone = @project.milestones.new(params[:milestone])
+
+    if @milestone.save
+      redirect_to project_milestone_path(@project, @milestone)
+    else
+      render "new"
+    end
+  end
+
+  def update
+    @milestone.update_attributes(params[:milestone])
+
+    respond_to do |format|
+      format.js
+      format.html do 
+        if @milestone.valid?
+          redirect_to [@project, @milestone]
+        else
+          render :edit
+        end
+      end
+    end
+  end
+
+  def destroy
+    return access_denied! unless can?(current_user, :admin_milestone, @milestone)
+
+    @milestone.destroy
+
+    respond_to do |format|
+      format.html { redirect_to project_milestones_path }
+      format.js { render :nothing => true }
+    end
+  end
+
+  protected
+
+  def milestone
+    @milestone ||= @project.milestones.find(params[:id])
+  end
+
+  def authorize_admin_milestone!
+    return render_404 unless can?(current_user, :admin_milestone, @project)
+  end
+
+  def module_enabled
+    return render_404 unless @project.issues_enabled
+  end
+end