jro_apps/redmine Commit - r3369:f7bd0801f6dc

Fixed: changing user/roles of project member not possible without javascript (#4852)...

Jean-Philippe Lang -

r3369:f7bd0801f6dc

parent child

Context file:

r3369:f7bd0801f6dc

Collapse all files

app/views/projects/settings/_members.rhtml +1 -1

             <%= error_messages_for 'member' %>
             <% roles = Role.find_all_givable
                members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
             <div class="splitcontentleft">
             <% if members.any? %>
             <table class="list members">
             	<thead>
             	  <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
             	  <th><%= l(:label_role_plural) %></th>
             	  <th style="width:15%"></th>
                       <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
             	</thead>
             	<tbody>
             	<% members.each do |member| %>
             	<% next if member.new_record? %>
             	<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
             	<td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
               <td class="roles">
                 <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
                 <% if authorize_for('members', 'edit') %>
                   <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
                   																		:method => :post,
-                  																		:html => { :id => "member-#{member.id}-roles-form", :style => 'display:none;' }) do |f| %>
+                  																		:html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
                   	<p><% roles.each do |role| %>
                     <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role),
                     																							 :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
                     <% end %></p>
                     <%= hidden_field_tag 'member[role_ids][]', '' %>
                     <p><%= submit_tag l(:button_change), :class => "small" %>
                     <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %></p>
                   <% end %>
                 <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
                   <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
                                                           :method => :post,
                                                           :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
                                                         }, :title => l(:button_delete),
                                                            :class => 'icon icon-del') if member.deletable? %>
               </td>
               <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
             	</tr>
             	</tbody>
             <% end; reset_cycle %>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
             <div class="splitcontentright">
             <% if roles.any? && principals.any? %>
               <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post) do |f| %>
                 <fieldset><legend><%=l(:label_member_new)%></legend>
             		<p><%= text_field_tag 'principal_search', nil, :size => "40" %></p>
             		<%= observe_field(:principal_search,
                              :frequency => 0.5,
                              :update => :principals,
                              :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
                              :with => 'q')
                               %>
             		<div id="principals">
             			<%= principals_check_box_tags 'member[user_ids][]', principals %>
             		</div>
                 <p><%= l(:label_role_plural) %>:
                 <% roles.each do |role| %>
                 	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %></label>
                	<% end %></p>
                 <p><%= submit_tag l(:button_add) %></p>
             		</fieldset>
               <% end %>
             <% end %>
             </div>

public/javascripts/application.js +6 0

             /* 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);
             }
             function toggleRowGroup(el) {
             	var tr = Element.up(el, 'tr');
             	var n = Element.next(tr);
             	tr.toggleClassName('open');
             	while (n != undefined && !n.hasClassName('group')) {
             		Element.toggle(n);
             		n = Element.next(n);
             	}
             }
             function toggleFieldset(el) {
             	var fieldset = Element.up(el, 'fieldset');
             	fieldset.toggleClassName('collapsed');
             	Effect.toggle(fieldset.down('div'), 'slide', {duration:0.2});
             }
             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 moveTabRight(el) {
             	var lis = Element.up(el, 'div.tabs').down('ul').childElements();
             	var tabsWidth = 0;
             	var i;
             	for (i=0; i<lis.length; i++) {
             		if (lis[i].visible()) {
             			tabsWidth += lis[i].getWidth() + 6;
             		}
             	}
             	if (tabsWidth < Element.up(el, 'div.tabs').getWidth() - 60) {
             		return;
             	}
             	i=0;
             	while (i<lis.length && !lis[i].visible()) {
             		i++;
             	}
             	lis[i].hide();
             }
             function moveTabLeft(el) {
             	var lis = Element.up(el, 'div.tabs').down('ul').childElements();
             	var i = 0;
             	while (i<lis.length && !lis[i].visible()) {
             		i++;
             	}
             	if (i>0) {
             		lis[i-1].show();
             	}
             }
             function displayTabsButtons() {
             	var lis;
             	var tabsWidth = 0;
             	var i;
             	$$('div.tabs').each(function(el) {
             		lis = el.down('ul').childElements();
             		for (i=0; i<lis.length; i++) {
             			if (lis[i].visible()) {
             				tabsWidth += lis[i].getWidth() + 6;
             			}
             		}
             		if ((tabsWidth < el.getWidth() - 60) && (lis[0].visible())) {
             			el.down('div.tabs-buttons').hide();
             		} else {
             			el.down('div.tabs-buttons').show();
             		}
             	});
             }
             function setPredecessorFieldsVisibility() {
                 relationType = $('relation_relation_type');
                 if (relationType && (relationType.value == "precedes" || relationType.value == "follows")) {
                     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});
                     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');
                     }
                 }
             });
+            Event.observe(window, 'load', function() {
+              $$('.hol').each(function(el) {
+              	el.hide();
+            	});
+            });

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