make autocomplete set top tags via ajax

scc · Oct 10, 2006 · f14ab12 · f14ab12
1 parent 8e66f9b
commit f14ab12
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/plugins/Ajax/htdocs/images/common.js b/plugins/Ajax/htdocs/images/common.js
@@ -296,6 +296,15 @@ function tagsCreateForUrl(id) {
 }
 
 //Firehose functions begin
+function setOneTopTagForFirehose(id, newtag) {
+  var params = [];
+  params['op'] = 'firehose_update_one_tag';
+  params['id'] = id;
+  params['tags'] = newtag;
+  params['reskey'] = reskeyel.value;
+  ajax_update(params, '');
+}
+
 function tagsCreateForFirehose(id) {
 	var toggletags_message_id = 'toggletags-message-' + id;
 	var toggletags_message_el = $(toggletags_message_id);

diff --git a/plugins/Ajax/htdocs/images/sd_autocomplete.js b/plugins/Ajax/htdocs/images/sd_autocomplete.js
@@ -251,6 +251,7 @@ YAHOO.slashdot.AutoCompleteWidget.prototype._show = function( obj, callbackParam
   {
     this._sourceEl = obj;
     this._callbackParams = callbackParams;
+    this._callbackParams._tagDomain = tagDomain;
     this._completer = this._newCompleter(tagDomain);
 
     if ( this._sourceEl && YAHOO.util.Dom.hasClass(this._widget, "hidden") )
@@ -334,11 +335,24 @@ YAHOO.slashdot.AutoCompleteWidget.prototype._onItemSelectEvent = function( type,
     if ( tagname && me._sourceEl )
       {
         me._sourceEl.innerHTML = tagname;
-        YAHOO.util.Dom.addClass(me._sourceEl, "not-yet-saved");
+        // YAHOO.util.Dom.addClass(me._sourceEl, "not-yet-saved");
       }
     var p = me._callbackParams;
     me._hide();
-    tagsOpenAndEnter(p._id, tagname, p._is_admin, p._type);
+
+      // really need to move this into a separate function...
+      //  at least when there is more than just p._type=='firehose'
+    switch ( p._tagDomain )
+      {
+        case 1: // action
+        case 2: // section
+        case 3: // topic
+          setOneTopTagForFirehose(p._id, tagname);
+          break;
+
+        default:
+          tagsOpenAndEnter(p._id, tagname, p._is_admin, p._type);
+      }
   }
 
 YAHOO.slashdot.AutoCompleteWidget.prototype._onTextboxBlurEvent = function( type, args, me )

diff --git a/plugins/FireHose/FireHose.pm b/plugins/FireHose/FireHose.pm
@@ -321,6 +321,15 @@ sub rejectItem {
 
 }
 
+sub ajaxSaveOneTopTagFirehose {
+  my($slashdb, $constants, $user, $form, $options) = @_;
+	my $id = $form->{id};
+	my $tagsstring = $form->{tags};
+	if ($user->{is_admin}) {
+		$firehose->setSectionTopicsFromTagstring($id, $tagsstring);
+	}
+}
+
 sub ajaxSaveNoteFirehose {
 	my($slashdb, $constants, $user, $form) = @_;
 	my $id = $form->{id};

diff --git a/plugins/FireHose/templates/firehose_tags_top;misc;default b/plugins/FireHose/templates/firehose_tags_top;misc;default
@@ -15,8 +15,7 @@ __seclev__
 __template__
 [% IF tags_top.size %]
 	[% FOR t = tags_top;
-		parts = t.split(":");
-		parts.1 = parts.1 || "0"; %]
-		<span class="tagname">[% IF user.tags_canwrite_stories %]<a onClick="attachCompleter(this, '[% id %]','[% user.is_admin %]','firehose', [% parts.1 %])">[% END %][% parts.0 | strip_html %][% IF user.tags_canwrite_stories %]</a>[% END %]</span>[% IF !loop.last() %], [% END -%]
+		parts = t.split(":"); %]
+		<span class="tagname">[% IF user.tags_canwrite_stories && parts.1.defined) %]<a onClick="attachCompleter(this, '[% id %]','[% user.is_admin %]','firehose', [% parts.1 %])">[% END %][% parts.0 | strip_html %][% IF user.tags_canwrite_stories && parts.1.defined %]</a>[% END %]</span>[% IF !loop.last() %], [% END -%]
 	[%- END %]
 [% END %]
diff --git a/sql/mysql/upgrades b/sql/mysql/upgrades
@@ -4041,6 +4041,7 @@ ALTER TABLE users_info CHANGE COLUMN mods_saved m2_mods_saved varchar(120) NOT N
 # Updates for plugins/FireHose
 INSERT INTO ajax_ops VALUES (NULL, 'firehose_fetch_new', 'Slash::FireHose', 'ajaxFireHoseFetchNew', 'ajax_user', 'createuse');
 INSERT INTO ajax_ops VALUES (NULL, 'firehose_check_removed', 'Slash::FireHose', 'ajaxFireHoseCheckRemoved', 'ajax_user', 'createuse');
+INSERT INTO ajax_ops VALUES (NULL, 'firehose_update_one_tag', 'Slash::FireHose', 'ajaxSaveOneTopTagFirehose', 'ajax_user', 'createuse');
 
 # 2006-09-06
 UPDATE vars SET value = 'T_2_5_0_125' WHERE name = 'cvs_tag_currentcode';