Merge branch 'feature-issue-actions' of https://github.com/jasonblanchard/gitlabhq into 6-5-dev

Dmitriy Zaporozhets
2 parents 8bcb2ff2 65448e2f
Showing 7 changed files with 140 additions and 17 deletions Show diff stats
CHANGELOG
app/assets/javascripts/issues.js.coffee
app/assets/stylesheets/sections/issues.scss
app/views/projects/issues/_issue_context.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/issues/update.js.haml
spec/features/issues_spec.rb
+v 6.5.0
+  - Dropdown menus on issue#show page for assignee and milestone (Jason Blanchard)
+
 v 6.4.0
   - Added sorting to project issues page (Jason Blanchard)
   - Assembla integration (Carlos Paramio)
@@ -79,3 +79,9 @@
       $("#update_issues_ids").val []
       $(".issues_bulk_update").hide()
       $(".issues-filters").show()
+
+$ ->
+  $('.edit-issue.inline-update input[type="submit"]').hide();
+  $("body").on "change", ".edit-issue.inline-update select", ->
+      $(this).submit()
+
@@ -119,3 +119,8 @@ input.check_all_issues {
     background-color: #f4f4f4;
   }
 }
+
+.edit-issue.inline-update select {
+  width: 100%;
+  max-width: 230px;
+}
@@ -0,0 +1,31 @@
+= form_for [@project, @issue], :remote => true, :html => {:class => 'edit-issue inline-update'} do |f|
+  .pull-right
+  Created by #{link_to_member(@project, issue.author)}
+  - if issue.assignee
+    \ and currently assigned to
+
+  - if can?(current_user, :modify_issue, @issue)
+    = link_to profile_path(issue.assignee) do
+      = image_tag(avatar_icon(issue.assignee.email), :class => 'avatar avatar-inline s16 assignee') if issue.assignee
+    = f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Assign to user (none):" }, {class: 'chosen'})
+  - elsif issue.assignee
+    = link_to_member(@project, @issue.assignee)
+
+  - if issue.milestone
+    - milestone = issue.milestone
+    %cite.cgray and attached to milestone
+  
+  - if can?(current_user, :modify_issue, @issue)
+    = f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone (none):" }, {class: 'chosen'})
+
+    = hidden_field_tag :issue_context
+    = f.submit :class => 'btn'
+  - elsif issue.milestone
+    = link_to issue.milestone.title, project_milestone_path
+
+.pull-right
+  - issue.labels.each do |label|
+    %span{class: "label #{label_css_class(label.name)}"}
+      %i.icon-tag
+      = label.name
+    &nbsp;
@@ -26,7 +26,12 @@
 .back-link
   = link_to project_issues_path(@project) do
     &larr; To issues list
-
+  %span.milestone-nav-link
+    - if @issue.milestone
+      | 
+      = link_to project_milestone_path(@project, @issue.milestone) do
+        <strong>Milestone:</strong>
+        = @issue.milestone.title
 .ui-box.ui-box-show
   .ui-box-head
@@ -39,21 +44,7 @@
   .ui-box-body
     %cite.cgray
-      Created by #{link_to_member(@project, @issue.author)}
-      - if @issue.assignee
-        \ and currently assigned to #{link_to_member(@project, @issue.assignee)}
-
-    - if @issue.milestone
-      - milestone = @issue.milestone
-      %cite.cgray and attached to milestone
-      %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
-
-    .pull-right
-      - @issue.labels.each do |label|
-        %span{class: "label #{label_css_class(label.name)}"}
-          %i.icon-tag
-          = label.name
-        &nbsp;
+      = render partial: 'issue_context', locals: { issue: @issue }
   - if @issue.description.present?
     .ui-box-bottom
@@ -73,4 +64,4 @@
   - @issue.participants.each do |participant|
     = link_to_member(@project, participant, name: false, size: 24)
-.voting_notes#notes= render "projects/notes/notes_with_form"
 \ No newline at end of file
+.voting_notes#notes= render "projects/notes/notes_with_form"
@@ -2,3 +2,12 @@
   - if @issue.valid?
     :plain
       $("##{dom_id(@issue)}").fadeOut();
+- elsif params[:issue_context]
+  $('.ui-box-body').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
+  $('.ui-box-body').effect('highlight');
+  $('.chosen').chosen();
+  $('.edit-issue.inline-update input[type="submit"]').hide();
+  - if @issue.milestone
+    $('.milestone-nav-link').replaceWith("#{escape_javascript(link_to "| #{@issue.milestone.title}", project_milestone_path(@issue.project, @issue.milestone), :class => 'milestone-nav-link')}")
+  - else
+    $('.milestone-nav-link').html('')
@@ -175,6 +175,84 @@ describe &quot;Issues&quot; do
     end
   end
+  describe 'update assignee from issue#show' do
+    let(:issue) { create(:issue, project: project, author: @user) }
+
+    context 'by autorized user' do
+
+      it 'with dropdown menu' do
+        visit project_issue_path(project, issue)
+
+        find('.edit-issue.inline-update').select(project.team.members.first.name, from: 'issue_assignee_id')
+        click_button 'Update Issue'
+
+        page.should have_content "currently assigned to"
+        page.has_select?('issue_assignee_id', :selected => project.team.members.first.name)
+      end
+    end
+
+    context 'by unauthorized user' do
+    
+      let(:guest) { create(:user) }
+      
+      before :each do
+        project.team << [[guest], :guest]
+        issue.assignee = @user
+        issue.save
+      end
+
+      it 'shows assignee text' do
+        logout
+        login_with guest
+
+        visit project_issue_path(project, issue)
+        page.should have_content "currently assigned to #{issue.assignee.name}"
+
+      end
+    end
+
+  end
+
+  describe 'update milestone from issue#show' do
+    let!(:issue) { create(:issue, project: project, author: @user) }
+    let!(:milestone) { create(:milestone, project: project) }
+
+    context 'by authorized user' do
+
+      it 'with dropdown menu' do
+        visit project_issue_path(project, issue)
+
+        p find('.edit-issue.inline-update').text
+
+        find('.edit-issue.inline-update').select(milestone.title, from: 'issue_milestone_id')
+        click_button 'Update Issue'
+
+        page.should have_content "and attached to milestone"
+        page.has_select?('issue_assignee_id', :selected => milestone.title)
+      end
+    end
+
+    context 'by unauthorized user' do
+      
+      let(:guest) { create(:user) }
+      
+      before :each do
+        project.team << [[guest], :guest]
+        issue.milestone = milestone
+        issue.save
+      end
+
+      it 'shows milestone text' do
+        logout
+        login_with guest
+
+        visit project_issue_path(project, issue)
+
+        page.should have_content "attached to milestone #{milestone.title}"
+      end
+    end
+  end
+
   def first_issue
     all("ul.issues-list li").first.text
   end
		1	+v 6.5.0
		2	+ - Dropdown menus on issue#show page for assignee and milestone (Jason Blanchard)
		3	+
1	v 6.4.0	4	v 6.4.0
2	- Added sorting to project issues page (Jason Blanchard)	5	- Added sorting to project issues page (Jason Blanchard)
3	- Assembla integration (Carlos Paramio)	6	- Assembla integration (Carlos Paramio)
	@@ -79,3 +79,9 @@		@@ -79,3 +79,9 @@
79	$("#update_issues_ids").val []	79	$("#update_issues_ids").val []
80	$(".issues_bulk_update").hide()	80	$(".issues_bulk_update").hide()
81	$(".issues-filters").show()	81	$(".issues-filters").show()
		82	+
		83	+$ ->
		84	+ $('.edit-issue.inline-update input[type="submit"]').hide();
		85	+ $("body").on "change", ".edit-issue.inline-update select", ->
		86	+ $(this).submit()
		87	+
	@@ -119,3 +119,8 @@ input.check_all_issues {		@@ -119,3 +119,8 @@ input.check_all_issues {
119	background-color: #f4f4f4;	119	background-color: #f4f4f4;
120	}	120	}
121	}	121	}
		122	+
		123	+.edit-issue.inline-update select {
		124	+ width: 100%;
		125	+ max-width: 230px;
		126	+}
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+= form_for [@project, @issue], :remote => true, :html => {:class => 'edit-issue inline-update'} do \|f\|
	2	+ .pull-right
	3	+ Created by #{link_to_member(@project, issue.author)}
	4	+ - if issue.assignee
	5	+ \ and currently assigned to
	6	+
	7	+ - if can?(current_user, :modify_issue, @issue)
	8	+ = link_to profile_path(issue.assignee) do
	9	+ = image_tag(avatar_icon(issue.assignee.email), :class => 'avatar avatar-inline s16 assignee') if issue.assignee
	10	+ = f.select(:assignee_id, @project.team.members.sort_by(&:name).map {\|p\| [ p.name, p.id ] }, { include_blank: "Assign to user (none):" }, {class: 'chosen'})
	11	+ - elsif issue.assignee
	12	+ = link_to_member(@project, @issue.assignee)
	13	+
	14	+ - if issue.milestone
	15	+ - milestone = issue.milestone
	16	+ %cite.cgray and attached to milestone
	17	+
	18	+ - if can?(current_user, :modify_issue, @issue)
	19	+ = f.select(:milestone_id, @project.milestones.active.all.collect {\|p\| [ p.title, p.id ] }, { include_blank: "Select milestone (none):" }, {class: 'chosen'})
	20	+
	21	+ = hidden_field_tag :issue_context
	22	+ = f.submit :class => 'btn'
	23	+ - elsif issue.milestone
	24	+ = link_to issue.milestone.title, project_milestone_path
	25	+
	26	+.pull-right
	27	+ - issue.labels.each do \|label\|
	28	+ %span{class: "label #{label_css_class(label.name)}"}
	29	+ %i.icon-tag
	30	+ = label.name
	31	+
	@@ -2,3 +2,12 @@		@@ -2,3 +2,12 @@
2	- if @issue.valid?	2	- if @issue.valid?
3	:plain	3	:plain
4	$("##{dom_id(@issue)}").fadeOut();	4	$("##{dom_id(@issue)}").fadeOut();
		5	+- elsif params[:issue_context]
		6	+ $('.ui-box-body').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
		7	+ $('.ui-box-body').effect('highlight');
		8	+ $('.chosen').chosen();
		9	+ $('.edit-issue.inline-update input[type="submit"]').hide();
		10	+ - if @issue.milestone
		11	+ $('.milestone-nav-link').replaceWith("#{escape_javascript(link_to "\| #{@issue.milestone.title}", project_milestone_path(@issue.project, @issue.milestone), :class => 'milestone-nav-link')}")
		12	+ - else
		13	+ $('.milestone-nav-link').html('')
	@@ -175,6 +175,84 @@ describe "Issues" do		@@ -175,6 +175,84 @@ describe "Issues" do
175	end	175	end
176	end	176	end
177		177
		178	+ describe 'update assignee from issue#show' do
		179	+ let(:issue) { create(:issue, project: project, author: @user) }
		180	+
		181	+ context 'by autorized user' do
		182	+
		183	+ it 'with dropdown menu' do
		184	+ visit project_issue_path(project, issue)
		185	+
		186	+ find('.edit-issue.inline-update').select(project.team.members.first.name, from: 'issue_assignee_id')
		187	+ click_button 'Update Issue'
		188	+
		189	+ page.should have_content "currently assigned to"
		190	+ page.has_select?('issue_assignee_id', :selected => project.team.members.first.name)
		191	+ end
		192	+ end
		193	+
		194	+ context 'by unauthorized user' do
		195	+
		196	+ let(:guest) { create(:user) }
		197	+
		198	+ before :each do
		199	+ project.team << [[guest], :guest]
		200	+ issue.assignee = @user
		201	+ issue.save
		202	+ end
		203	+
		204	+ it 'shows assignee text' do
		205	+ logout
		206	+ login_with guest
		207	+
		208	+ visit project_issue_path(project, issue)
		209	+ page.should have_content "currently assigned to #{issue.assignee.name}"
		210	+
		211	+ end
		212	+ end
		213	+
		214	+ end
		215	+
		216	+ describe 'update milestone from issue#show' do
		217	+ let!(:issue) { create(:issue, project: project, author: @user) }
		218	+ let!(:milestone) { create(:milestone, project: project) }
		219	+
		220	+ context 'by authorized user' do
		221	+
		222	+ it 'with dropdown menu' do
		223	+ visit project_issue_path(project, issue)
		224	+
		225	+ p find('.edit-issue.inline-update').text
		226	+
		227	+ find('.edit-issue.inline-update').select(milestone.title, from: 'issue_milestone_id')
		228	+ click_button 'Update Issue'
		229	+
		230	+ page.should have_content "and attached to milestone"
		231	+ page.has_select?('issue_assignee_id', :selected => milestone.title)
		232	+ end
		233	+ end
		234	+
		235	+ context 'by unauthorized user' do
		236	+
		237	+ let(:guest) { create(:user) }
		238	+
		239	+ before :each do
		240	+ project.team << [[guest], :guest]
		241	+ issue.milestone = milestone
		242	+ issue.save
		243	+ end
		244	+
		245	+ it 'shows milestone text' do
		246	+ logout
		247	+ login_with guest
		248	+
		249	+ visit project_issue_path(project, issue)
		250	+
		251	+ page.should have_content "attached to milestone #{milestone.title}"
		252	+ end
		253	+ end
		254	+ end
		255	+
178	def first_issue	256	def first_issue
179	all("ul.issues-list li").first.text	257	all("ul.issues-list li").first.text
180	end	258	end