jro_apps/redmine Commit - r3190:8bab5b4730b1

Fixed: Cannot create a new category on ticket creation/update page with 0.8.7 (#4400)....

Jean-Philippe Lang -

r3190:8bab5b4730b1

parent child

Context file:

r3190:8bab5b4730b1

Collapse all files

app/views/issues/_form.rhtml +1 -1

             <% if @issue.new_record? %>
             <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
             <%= observe_field :issue_tracker_id, :url => { :action => :new },
                                                  :update => :content,
                                                  :with => "Form.serialize('issue-form')" %>
             <hr />
             <% end %>
             <div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <p><%= f.text_area :description,
                                :cols => 60,
                                :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                                :accesskey => accesskey(:edit),
                                :class => 'wiki-edit' %></p>
             </div>
             <div class="splitcontentleft">
             <% if @issue.new_record? || @allowed_statuses.any? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>
             <% end %>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
             <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
             <% unless @project.issue_categories.empty? %>
             <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
             <%= prompt_to_remote(l(:label_issue_category_new),
                                  l(:label_issue_category_new), 'category[name]',
-                                 {:controller => 'projects', :action => 'add_issue_category', :id => @project},
+                                 {:controller => 'projects', :action => 'add_issue_category', :id => @project, :authenticity_token => form_authenticity_token},
                                  :class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p>
             <% end %>
             <%= content_tag('p', f.select(:fixed_version_id,
                                           (@project.versions.sort.collect {|v| [v.name, v.id]}),
                                           { :include_blank => true })) unless @project.versions.empty? %>
             </div>
             <div class="splitcontentright">
             <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
             <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
             <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
             </div>
             <div style="clear:both;"> </div>
             <%= render :partial => 'form_custom_fields' %>
             <% if @issue.new_record? %>
             <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
             <% end %>
             <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
             <p><label><%= l(:label_issue_watchers) %></label>
             <% @issue.project.users.sort.each do |user| -%>
             <label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watcher_user_ids.include?(user.id) %> <%=h user %></label>
             <% end -%>
             </p>
             <% end %>
             <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
             <%= wikitoolbar_for 'issue_description' %>

public/javascripts/application.js +2 -1

             /* redMine - project management software
                Copyright (C) 2006-2008  Jean-Philippe Lang */
             function checkAll (id, checked) {
             	var els = Element.descendants(id);
             	for (var i = 0; i < els.length; i++) {
                 if (els[i].disabled==false) {
                   els[i].checked = checked;
                 }
             	}
             }
             function toggleCheckboxesBySelector(selector) {
             	boxes = $$(selector);
             	var all_checked = true;
             	for (i = 0; i < boxes.length; i++) { if (boxes[i].checked == false) { all_checked = false; } }
             	for (i = 0; i < boxes.length; i++) { boxes[i].checked = !all_checked; }
             }
             function showAndScrollTo(id, focus) {
             	Element.show(id);
             	if (focus!=null) { Form.Element.focus(focus); }
             	Element.scrollTo(id);
             }
             var fileFieldCount = 1;
             function addFileField() {
                 if (fileFieldCount >= 10) return false
                 fileFieldCount++;
                 var f = document.createElement("input");
                 f.type = "file";
                 f.name = "attachments[" + fileFieldCount + "][file]";
                 f.size = 30;
                 var d = document.createElement("input");
                 d.type = "text";
                 d.name = "attachments[" + fileFieldCount + "][description]";
                 d.size = 60;
                 p = document.getElementById("attachments_fields");
                 p.appendChild(document.createElement("br"));
                 p.appendChild(f);
                 p.appendChild(d);
             }
             function showTab(name) {
                 var f = $$('div#content .tab-content');
             	for(var i=0; i<f.length; i++){
             		Element.hide(f[i]);
             	}
                 var f = $$('div.tabs a');
             	for(var i=0; i<f.length; i++){
             		Element.removeClassName(f[i], "selected");
             	}
             	Element.show('tab-content-' + name);
             	Element.addClassName('tab-' + name, "selected");
             	return false;
             }
             function setPredecessorFieldsVisibility() {
                 relationType = $('relation_relation_type');
                 if (relationType && relationType.value == "precedes") {
                     Element.show('predecessor_fields');
                 } else {
                     Element.hide('predecessor_fields');
                 }
             }
             function promptToRemote(text, param, url) {
                 value = prompt(text + ':');
                 if (value) {
-                    new Ajax.Request(url + '?' + param + '=' + encodeURIComponent(value), {asynchronous:true, evalScripts:true});
+                		var sep = (url.indexOf('?') < 0 ? '?' : '&' )
+                    new Ajax.Request(url + sep + param + '=' + encodeURIComponent(value), {asynchronous:true, evalScripts:true});
                     return false;
                 }
             }
             function collapseScmEntry(id) {
                 var els = document.getElementsByClassName(id, 'browser');
             	for (var i = 0; i < els.length; i++) {
             	   if (els[i].hasClassName('open')) {
             	       collapseScmEntry(els[i].id);
             	   }
                    Element.hide(els[i]);
                 }
                 $(id).removeClassName('open');
             }
             function expandScmEntry(id) {
                 var els = document.getElementsByClassName(id, 'browser');
             	for (var i = 0; i < els.length; i++) {
                    Element.show(els[i]);
                    if (els[i].hasClassName('loaded') && !els[i].hasClassName('collapsed')) {
                         expandScmEntry(els[i].id);
                    }
                 }
                 $(id).addClassName('open');
             }
             function scmEntryClick(id) {
                 el = $(id);
                 if (el.hasClassName('open')) {
                     collapseScmEntry(id);
                     el.addClassName('collapsed');
                     return false;
                 } else if (el.hasClassName('loaded')) {
                     expandScmEntry(id);
                     el.removeClassName('collapsed');
                     return false;
                 }
                 if (el.hasClassName('loading')) {
                     return false;
                 }
                 el.addClassName('loading');
                 return true;
             }
             function scmEntryLoaded(id) {
                 Element.addClassName(id, 'open');
                 Element.addClassName(id, 'loaded');
                 Element.removeClassName(id, 'loading');
             }
             function randomKey(size) {
             	var chars = new Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z');
             	var key = '';
             	for (i = 0; i < size; i++) {
               	key += chars[Math.floor(Math.random() * chars.length)];
             	}
             	return key;
             }
             /* shows and hides ajax indicator */
             Ajax.Responders.register({
                 onCreate: function(){
                     if ($('ajax-indicator') && Ajax.activeRequestCount > 0) {
                         Element.show('ajax-indicator');
                     }
                 },
                 onComplete: function(){
                     if ($('ajax-indicator') && Ajax.activeRequestCount == 0) {
                         Element.hide('ajax-indicator');
                     }
                 }
             });

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages