diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index bad778e..d3949cb 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -79,12 +79,14 @@ class IssuesController < ApplicationController begin @issue.init_journal(self.logged_in_user) # Retrieve custom fields and values - @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) } - @issue.custom_values = @custom_values + if params["custom_fields"] + @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) } + @issue.custom_values = @custom_values + end @issue.attributes = params[:issue] if @issue.save flash[:notice] = l(:notice_successful_update) - redirect_to :action => 'show', :id => @issue + redirect_to(params[:back_to] || {:action => 'show', :id => @issue}) end rescue ActiveRecord::StaleObjectError # Optimistic locking exception @@ -163,6 +165,19 @@ class IssuesController < ApplicationController journal.save redirect_to :action => 'show', :id => @issue end + + def context_menu + @priorities = Enumeration.get_values('IPRI').reverse + @statuses = IssueStatus.find(:all, :order => 'position') + @allowed_statuses = @issue.status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker) + @assignables = @issue.assignable_users + @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to) + @can = {:edit => User.current.allowed_to?(:edit_issues, @project), + :change_status => User.current.allowed_to?(:change_issue_status, @project), + :move => User.current.allowed_to?(:move_issues, @project), + :delete => User.current.allowed_to?(:delete_issues, @project)} + render :layout => false + end def preview issue = Issue.find_by_id(params[:id]) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0833c43..3fc333a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -296,6 +296,22 @@ module ApplicationHelper link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)") end + def context_menu_link(name, url, options={}) + options[:class] ||= '' + if options.delete(:selected) + options[:class] << ' icon-checked disabled' + options[:disabled] = true + end + if options.delete(:disabled) + options.delete(:method) + options.delete(:confirm) + options.delete(:onclick) + options[:class] << ' disabled' + url = '#' + end + link_to name, url, options + end + def calendar_for(field_id) image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) + javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });") diff --git a/app/views/issues/_list.rhtml b/app/views/issues/_list.rhtml index a3feb8c..d8e3102 100644 --- a/app/views/issues/_list.rhtml +++ b/app/views/issues/_list.rhtml @@ -13,7 +13,7 @@ <% issues.each do |issue| %> - "> + "> <%= check_box_tag("issue_ids[]", issue.id, false, :id => "issue_#{issue.id}", :disabled => (!@project || @project != issue.project)) %> <%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %> <% query.columns.each do |column| %> diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml new file mode 100644 index 0000000..caf6a76 --- /dev/null +++ b/app/views/issues/context_menu.rhtml @@ -0,0 +1,38 @@ +<% back_to = url_for(:controller => 'projects', :action => 'list_issues', :id => @project) %> + diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml index 9f2ff87..0c0aaa4 100644 --- a/app/views/projects/list_issues.rhtml +++ b/app/views/projects/list_issues.rhtml @@ -64,4 +64,9 @@ <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %> <%= javascript_include_tag 'calendar/calendar-setup' %> <%= stylesheet_link_tag 'calendar' %> + <%= javascript_include_tag 'context_menu' %> + <%= stylesheet_link_tag 'context_menu' %> <% end %> + + +<%= javascript_tag 'new ContextMenu({})' %> diff --git a/lib/redmine.rb b/lib/redmine.rb index ceb5315..bf6d630 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -26,7 +26,7 @@ Redmine::AccessControl.map do |map| map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member # Issues map.permission :view_issues, {:projects => [:list_issues, :export_issues_csv, :export_issues_pdf, :changelog, :roadmap], - :issues => :show, + :issues => [:show, :context_menu], :queries => :index, :reports => :issue_report}, :public => true map.permission :add_issues, {:projects => :add_issue}, :require => :loggedin diff --git a/public/images/sub.gif b/public/images/sub.gif new file mode 100644 index 0000000000000000000000000000000000000000..52e4065d5ac3e3c7df4f6220ebf2752be6dbd429 GIT binary patch literal 52 xc${body #content { height: auto; @@ -154,7 +154,7 @@ width: 200px; div.attachments p { margin:4px 0 2px 0; } /***** Flash & error messages ****/ -#errorExplanation, div.flash, div.nodata { +#errorExplanation, div.flash, .nodata { padding: 4px 4px 4px 30px; margin-bottom: 12px; font-size: 1.1em; @@ -454,6 +454,7 @@ vertical-align: middle; .icon-lock { background-image: url(../images/locked.png); } .icon-unlock { background-image: url(../images/unlock.png); } .icon-note { background-image: url(../images/note.png); } +.icon-checked { background-image: url(../images/true.png); } .icon22-projects { background-image: url(../images/22x22/projects.png); } .icon22-users { background-image: url(../images/22x22/users.png); } diff --git a/public/stylesheets/context_menu.css b/public/stylesheets/context_menu.css new file mode 100644 index 0000000..52cac79 --- /dev/null +++ b/public/stylesheets/context_menu.css @@ -0,0 +1,52 @@ +#context-menu { position: absolute; } + +#context-menu ul, #context-menu li, #context-menu a { + display:block; + margin:0; + padding:0; + border:0; +} + +#context-menu ul { + width:150px; + border-top:1px solid #ddd; + border-left:1px solid #ddd; + border-bottom:1px solid #777; + border-right:1px solid #777; + background:white; + list-style:none; +} + +#context-menu li { + position:relative; + padding:1px; + z-index:9; +} +#context-menu li.folder ul { + position:absolute; + left:128px; /* IE */ + top:-2px; +} +#context-menu li.folder>ul { left:148px; } + +#context-menu a { + border:1px solid white; + text-decoration:none; + background-repeat: no-repeat; + background-position: 1px 50%; + padding: 2px 0px 2px 20px; + width:100%; /* IE */ +} +#context-menu li>a { width:auto; } /* others */ +#context-menu a.disabled, #context-menu a.disabled:hover {color: #ccc;} +#context-menu li a.submenu { background:url("../images/sub.gif") right no-repeat; } +#context-menu a:hover { border-color:gray; background-color:#eee; color:#2A5685; } +#context-menu li.folder a:hover { background-color:#eee; } +#context-menu li.folder:hover { z-index:10; } +#context-menu ul ul, #context-menu li:hover ul ul { display:none; } +#context-menu li:hover ul, #context-menu li:hover li:hover ul { display:block; } + +/* selected element */ +.context-menu-selection { background-color:#507AAA !important; color:#f8f8f8 !important; } +.context-menu-selection a, .context-menu-selection a:hover { color:#f8f8f8 !important; } +.context-menu-selection:hover { background-color:#507AAA !important; color:#f8f8f8 !important; }