jro_apps/redmine Commit - r3670:2562bc5bcd0c

Hide the role forms when editing or adding Project members. #5452...

Eric Davis -

r3670:2562bc5bcd0c

parent child

Context file:

r3670:2562bc5bcd0c

Collapse all files

app/controllers/members_controller.rb +7 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MembersController < ApplicationController
               model_object Member
               before_filter :find_model_object, :except => [:new, :autocomplete_for_member]
               before_filter :find_project_from_association, :except => [:new, :autocomplete_for_member]
               before_filter :find_project, :only => [:new, :autocomplete_for_member]
               before_filter :authorize
               def new
                 members = []
                 if params[:member] && request.post?
                   attrs = params[:member].dup
                   if (user_ids = attrs.delete(:user_ids))
                     user_ids.each do |user_id|
                       members << Member.new(attrs.merge(:user_id => user_id))
                     end
                   else
                     members << Member.new(attrs)
                   end
                   @project.members << members
                 end
                 respond_to do |format|
                   if members.present? && members.all? {|m| m.valid? }
                     format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
                     format.js {
                       render(:update) {|page|
                         page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+                        page << 'hideOnLoad()'
                         members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
                       }
                     }
                   else
                     format.js {
                       render(:update) {|page|
                         errors = members.collect {|m|
                           m.errors.full_messages
                         }.flatten.uniq
                         page.alert(l(:notice_failed_to_save_members, :errors => errors.join(', ')))
                       }
                     }
                   end
                 end
               end
               def edit
                 if request.post? and @member.update_attributes(params[:member])
               	 respond_to do |format|
                     format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
                     format.js {
                       render(:update) {|page|
                         page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+                        page << 'hideOnLoad()'
                         page.visual_effect(:highlight, "member-#{@member.id}")
                       }
                     }
                   end
                 end
               end
               def destroy
                 if request.post? && @member.deletable?
                   @member.destroy
                 end
                 respond_to do |format|
                   format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
-                  format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
+                  format.js { render(:update) {|page|
+                      page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+                      page << 'hideOnLoad()'
+                    }
+                  }
                 end
               end
               def autocomplete_for_member
                 @principals = Principal.active.like(params[:q]).find(:all, :limit => 100) - @project.principals
                 render :layout => false
               end
             end

public/javascripts/application.js +4 -2

             /* 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;
                 var dLabel = document.createElement("label");
                 dLabel.addClassName('inline');
                 // Pulls the languge value used for Optional Description
                 dLabel.update($('attachment_description_label_content').innerHTML)
                 p = document.getElementById("attachments_fields");
                 p.appendChild(document.createElement("br"));
                 p.appendChild(f);
                 p.appendChild(dLabel);
                 dLabel.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;
             }
             function observeParentIssueField(url) {
               new Ajax.Autocompleter('issue_parent_issue_id',
                                      'parent_issue_candidates',
                                      url,
                                      { minChars: 3,
                                        frequency: 0.5,
                                        paramName: 'q',
                                        updateElement: function(value) {
                                          document.getElementById('issue_parent_issue_id').value = value.id;
                                        }});
             }
             /* 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() {
+            function hideOnLoad() {
               $$('.hol').each(function(el) {
               	el.hide();
             	});
-            });
+            Event.observe(window, 'load', hideOnLoad);

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