redmine_version_priorities 0.1.0 → 0.1.1

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.0
1
+ 0.1.1
@@ -5,15 +5,15 @@ class VersionPrioritiesController < ApplicationController
5
5
  before_filter :require_admin, :only => :update
6
6
 
7
7
  def show
8
- @prioritized_versions = Version.visible.prioritized
9
- @unprioritized_versions = Version.visible.unprioritized
8
+ @prioritized_versions = Version.visible.not_closed.prioritized
9
+ @unprioritized_versions = Version.visible.not_closed.unprioritized
10
10
  end
11
11
 
12
12
  def update
13
13
  Version.reprioritize(params[:version])
14
14
 
15
- @prioritized_versions = Version.visible.prioritized
16
- @unprioritized_versions = Version.visible.unprioritized
15
+ @prioritized_versions = Version.visible.not_closed.prioritized
16
+ @unprioritized_versions = Version.visible.not_closed.unprioritized
17
17
 
18
18
  respond_to do |format|
19
19
  format.html { redirect_to version_priorities_path }
@@ -8,7 +8,7 @@ li.version { clear: both; }
8
8
 
9
9
  /* item elements */
10
10
  li.version span.due_date { font-size: smaller; }
11
- li.version table.progress { display: inline; position: relative; float: right; }
11
+ li.version table.progress { position: relative; float: right; }
12
12
  li.version p.pourcent { display: inline; position: relative; float: right; }
13
13
 
14
14
  h1.version-priority-title { margin-bottom: 15px; }
data/init.rb CHANGED
@@ -6,7 +6,7 @@ Redmine::Plugin.register :redmine_version_priorities do
6
6
  url 'https://projects.littlestreamsoftware.com/projects/version-priorities'
7
7
  author_url 'http://www.littlestreamsoftware.com'
8
8
  description 'Allows versions to be prioritized'
9
- version '0.1.0'
9
+ version '0.1.1'
10
10
 
11
11
  requires_redmine :version_or_higher => '0.9.0'
12
12
 
@@ -12,6 +12,8 @@ module RedmineVersionPriorities
12
12
  named_scope :prioritized, :conditions => ["priority != 0 AND priority IS NOT NULL"], :order => 'priority ASC'
13
13
  named_scope :unprioritized, :conditions => ["priority = 0 OR priority IS NULL"]
14
14
 
15
+ named_scope :not_closed, :conditions => ["#{Version.table_name}.status != ?", 'closed']
16
+
15
17
  private
16
18
 
17
19
  # Override acts_as_list to allow nil priorities
@@ -28,8 +28,9 @@ class ViewVersionPrioritiesTest < ActionController::IntegrationTest
28
28
  @user = login_as_user
29
29
  @project1 = Project.generate!
30
30
  @project2 = Project.generate!
31
- @version1 = Version.generate!(:project => @project1)
32
- @version2 = Version.generate!(:project => @project2)
31
+ @version1 = Version.generate!(:project => @project1, :description => 'Open')
32
+ @version2 = Version.generate!(:project => @project2, :description => 'Locked', :status => 'locked')
33
+ @closed_version = Version.generate!(:project => @project2, :description => 'Closed', :status => 'closed')
33
34
  @role = Role.generate!(:permissions => [:view_issues])
34
35
  Member.generate!(:principal => @user, :roles => [@role], :project => @project1)
35
36
  Member.generate!(:principal => @user, :roles => [@role], :project => @project2)
@@ -38,14 +39,20 @@ class ViewVersionPrioritiesTest < ActionController::IntegrationTest
38
39
 
39
40
  assert_select "#unprioritized-versions" do
40
41
  assert_select "li" do
41
- assert_select "a", :text => /#{@version1.name}/
42
+ assert_select "a", :text => /#{@version1.reload.name}/
42
43
  assert_select "span", :text => /#{@version1.description}/
43
44
  end
44
45
 
45
46
  assert_select "li" do
46
- assert_select "a", :text => /#{@version2.name}/
47
+ assert_select "a", :text => /#{@version2.reload.name}/
47
48
  assert_select "span", :text => /#{@version2.description}/
48
49
  end
50
+
51
+ assert_select "li" do
52
+ assert_select "a", :text => /#{@closed_version.reload.name}/, :count => 0
53
+ assert_select "span", :text => /#{@closed_version.description}/, :count => 0
54
+ end
55
+
49
56
  end
50
57
 
51
58
  end
@@ -55,7 +62,7 @@ class ViewVersionPrioritiesTest < ActionController::IntegrationTest
55
62
  @project1 = Project.generate!
56
63
  @project2 = Project.generate!
57
64
  @version1 = Version.generate!(:project => @project1, :priority => 1)
58
- @version2 = Version.generate!(:project => @project2, :priority => 2)
65
+ @version2 = Version.generate!(:project => @project2, :priority => 2, :status => 'locked')
59
66
  @role = Role.generate!(:permissions => [:view_issues])
60
67
  Member.generate!(:principal => @user, :roles => [@role], :project => @project1)
61
68
  Member.generate!(:principal => @user, :roles => [@role], :project => @project2)
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 1
8
- - 0
9
- version: 0.1.0
8
+ - 1
9
+ version: 0.1.1
10
10
  platform: ruby
11
11
  authors:
12
12
  - Eric Davis
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-05-06 00:00:00 -07:00
17
+ date: 2010-05-12 00:00:00 -07:00
18
18
  default_executable:
19
19
  dependencies: []
20
20