changeset 802:4719c1f813fc cannam

Merge from branch feature_14

--- a/vendor/plugins/redmine_tags/assets/javascripts/projects_index.js	Fri Nov 18 17:15:38 2011 +0000
+++ b/vendor/plugins/redmine_tags/assets/javascripts/projects_index.js	Mon Nov 21 16:45:19 2011 +0000
@@ -5,8 +5,13 @@
 	change_session(id, status);
 	
 	toggleFieldset(this_field);
+
 };
 
+	function submitForm(){
+		$('submitButton').click();		
+	};
+
 function change_session(id, nstatus) {
 	var url = "projects/set_fieldset_status";
  	var request = new Ajax.Request(url, {
@@ -16,20 +21,16 @@
   	});
 }
 
-function submitForm(){
-	$('submitButton').click(); return false;
-}
-
 function keypressHandler (event){
-    var key = event.which || event.keyCode;
-    switch (key) {
-        default:
-        break;
-        case Event.KEY_RETURN:
-            $('submitButton').click(); return false;
-        break;   
-    }
-}
+  var key = event.which || event.keyCode;
+  switch (key) {
+      default:
+      break;
+      case Event.KEY_RETURN:
+          $('submitButton').click(); return false;
+      break;   
+  };
+};
 
 document.observe("dom:loaded", function() {
 	$('search-input').observe('keypress', keypressHandler);	

--- a/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js	Fri Nov 18 17:15:38 2011 +0000
+++ b/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js	Mon Nov 21 16:45:19 2011 +0000
@@ -28,7 +28,12 @@
     this.tags     = new Hash();
     
 		this.update = update;
-
+		
+		var uri_params = window.location.href.toQueryParams();
+		if (uri_params["project[tag_list]"] != undefined){
+			this.addTag(uri_params["project[tag_list]"], true);			
+		};
+		
     Event.observe(this.button, 'click', this.readTags.bind(this));
     Event.observe(this.input, 'keypress', this.onKeyPress.bindAsEventListener(this));
 
@@ -40,7 +45,9 @@
   readTags: function() {		
     this.addTagsList(this.input.value);
     this.input.value = '';
-		if(this.update){submitForm();};
+		if(this.update){
+			submitForm();
+		};
   },
 
   onKeyPress: function(event) {
@@ -50,9 +57,11 @@
     }
   },
 
-  addTag: function(tag) {
+  addTag: function(tag, noSubmit) {
     if (tag.blank() || this.tags.get(tag)) return;
 
+		if(noSubmit==undefined){noSubmit=false;}
+
     var button = new Element('span', { 'class': 'tag-delete icon icon-del' });
     var label  = new Element('span', { 'class': 'tag-label' }).insert(tag).insert(button);
 
@@ -60,7 +69,11 @@
     this.element.value = this.getTagsList();
     this.element.insert({ 'before': label });
 
-		if(this.update){submitForm();};
+		if(noSubmit==false){
+			if(this.update){
+				submitForm();
+			};
+		};
 
     Event.observe(button, 'click', function(){
       this.tags.unset(tag);

--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb	Fri Nov 18 17:15:38 2011 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb	Mon Nov 21 16:45:19 2011 +0000
@@ -64,7 +64,7 @@
           s << " no_description" if project.description.blank?
           s << "'>" << link_to( highlight_tokens(project.name, tokens), {:controller => 'projects', :action => 'show', :id => project}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
           s << "</div>"
-          s << render_project_short_description(project)
+          s << highlight_tokens(render_project_short_description(project), tokens)
           s << "<td class='managers' align=top>"
            
           u = project.users_by_role