[Logilogi-svn] SF.net SVN: logilogi:[1549] trunk

Revision: 1549
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1549&view=rev
Author:   wybow
Date:     2009-08-21 13:45:50 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
Fixed bug in tag-browsing and editing untagged logis

Modified Paths:
--------------
    trunk/app/views/links/_new.html.erb
    trunk/app/views/logi_tags/_edit.html.erb
    trunk/app/views/logis/_edit.html.erb
    trunk/app/views/logis/_tag_list.html.erb
    trunk/app/views/tags/_edit.html.erb
    trunk/public/javascripts/application.js
    trunk/public/javascripts/taglist.js

Modified: trunk/app/views/links/_new.html.erb
===================================================================
--- trunk/app/views/links/_new.html.erb	2009-08-20 11:09:08 UTC (rev 1548)
+++ trunk/app/views/links/_new.html.erb	2009-08-21 13:45:50 UTC (rev 1549)
@@ -1 +1,2 @@
-<%= render :partial => 'tags/edit', :locals => {:name => 'tags_edit'} %>
+<%= render :partial => 'tags/edit', :locals => {
+    :name => 'tags_edit', :link => current_context.link} %>

Modified: trunk/app/views/logi_tags/_edit.html.erb
===================================================================
--- trunk/app/views/logi_tags/_edit.html.erb	2009-08-20 11:09:08 UTC (rev 1548)
+++ trunk/app/views/logi_tags/_edit.html.erb	2009-08-21 13:45:50 UTC (rev 1549)
@@ -1,7 +1,6 @@
 <div class="main_column">
-  <%= render :partial => 'tags/edit', :locals => {:name => 'logi_tags_edit'} %>
-
-  <%= hidden_field_tag 'logi[link_string]', '' %>
+  <%= render :partial => 'tags/edit', :locals => {:name => 'logi_tags_edit',
+      :link => (@logi.new_record? ? current_context.link : (@logi.untagged? ? nil : @logi.link))} %>
 </div>
 
 <div class="side_column">

Modified: trunk/app/views/logis/_edit.html.erb
===================================================================
--- trunk/app/views/logis/_edit.html.erb	2009-08-20 11:09:08 UTC (rev 1548)
+++ trunk/app/views/logis/_edit.html.erb	2009-08-21 13:45:50 UTC (rev 1549)
@@ -1,5 +1,6 @@
 <% render :layout => 'logis/logi', :locals => {:id => "logi_edit"} do %>
   <label class="for_title">Title:</label>
+  <%= hidden_field_tag 'logi[link_string]', '' %>
   <%= text_field_tag 'logi[title]', (logi_version.nil? ? nil : logi_version.title), 
           :class => "logi_title",
           : "logiLogisOnChange(tinyMCE.getInstanceById('logi_body')," +

Modified: trunk/app/views/logis/_tag_list.html.erb
===================================================================
--- trunk/app/views/logis/_tag_list.html.erb	2009-08-20 11:09:08 UTC (rev 1548)
+++ trunk/app/views/logis/_tag_list.html.erb	2009-08-21 13:45:50 UTC (rev 1549)
@@ -12,8 +12,7 @@
 <% if !local_assigns[:without_form] %>
   <%= end_form_tag() %>
 <% end %>
-<% javascript_tag do -%>
-  var <%= name %> = new TagList('<%= name %>', '<%= url %>',
-      '<%= param_name %>', '<%= Tag.replace.to_s %>',
-      '<%= Tag.untagged.to_s %>');
-<% end -%>
+<% javascript_tag do %>
+  <%= name %> = new TagList('<%= name %>', '<%= url %>',
+      '<%= param_name %>', '<%= Tag.replace.to_s %>');
+<% end %>

Modified: trunk/app/views/tags/_edit.html.erb
===================================================================
--- trunk/app/views/tags/_edit.html.erb	2009-08-20 11:09:08 UTC (rev 1548)
+++ trunk/app/views/tags/_edit.html.erb	2009-08-21 13:45:50 UTC (rev 1549)
@@ -1,9 +1,11 @@
 <% render :layout => 'application/panel', :locals => {:id => name} do %>
   <label>Tags</label>
-  <%= button_to_function _('Clear all tags'), name + '_list.remove_all_tags(); link_list.submit()', :class => 'cancel_button' %>
+  <%= button_to_function _('Clear all tags'),
+      name + '_list.remove_all_tags(); ' + name + '_list.submit()',
+      :class => 'cancel_button' %>
   <div class="spacer"></div>
   <%= render :partial => 'logis/tag_list', :locals => {:name => name + '_list', 
-      :link => current_context.link,
+      :link => link,
       :url => check_logi_url(:controller => 'logis', :action => 'check', :name => name), 
       :param_name => 'check_ll_link_string', :without_form => true} %>
   <div class="spacer"></div>

Modified: trunk/public/javascripts/application.js
===================================================================
--- trunk/public/javascripts/application.js	2009-08-20 11:09:08 UTC (rev 1548)
+++ trunk/public/javascripts/application.js	2009-08-21 13:45:50 UTC (rev 1549)
@@ -263,9 +263,9 @@
 // For editing and new
 
 function logiEditPrepareLink() {
-	var form = $('edit_form');
-	var link_string = $F("logi_tags_edit_list_string");
-  $('logi_link_string').value = link_string;
+  if (typeof(logi_tags_edit_list) != "undefined") {
+    $('logi_link_string').value = logi_tags_edit_list.hidden_tags_string();
+  }
 }
 
 // For link removal

Modified: trunk/public/javascripts/taglist.js
===================================================================
--- trunk/public/javascripts/taglist.js	2009-08-20 11:09:08 UTC (rev 1548)
+++ trunk/public/javascripts/taglist.js	2009-08-21 13:45:50 UTC (rev 1549)
@@ -16,7 +16,7 @@
 var TagList = Class.create({
   // Constructors
   
-  initialize: function(list_id, url, param_name, replace_string, untagged_string) {
+  initialize: function(list_id, url, param_name, replace_string) {
     this.list_id = list_id;
     this.list = $(list_id);
     this.add_field = $(list_id + '_input');
@@ -25,7 +25,6 @@
     this.param_name = param_name;
     this.replace_string = this.empty_default(replace_string);
     this.empty_string = this.replace_string;
-    this.untagged_string = this.empty_default(untagged_string);
     this.register_button();
     this.render_tags();
   },
@@ -47,9 +46,18 @@
 
   // Getters
 
+  hidden_tags_string: function() {
+    if (this.hidden_field != null) {
+      tag_str = this.hidden_field.getValue();
+      return tag_str;
+    } else {
+      return ""
+    }
+  },
+
   tags_string: function() {
-    tag_str = this.hidden_field.getValue();
-    if (tag_str == "" || tag_str == this.untagged_string) {
+    tag_str = this.hidden_tags_string();
+    if (tag_str == "") {
       return this.empty_string;
     } else {
       return tag_str;
@@ -68,8 +76,9 @@
   // Setters
 
   set_tag_strings: function(tags) {
-    this.hidden_field.value = tags.without(
-        this.replace_string, this.untagged_string).join('/');
+    if (this.hidden_field != null) {
+      this.hidden_field.value = tags.without(this.replace_string).join('/');
+    }
   },
 
   // Adding and removing
@@ -109,8 +118,7 @@
     // reset empty string
     this.empty_string = this.replace_string;
 
-    tag_strs = this.tag_strings();
-    this.hidden_field.value = '';
+    this.set_tag_strings([])
 
     this.render_tags();
   },
@@ -133,7 +141,8 @@
   submit: function() {
     new Ajax.Request(this.url, {
         asynchronous: true, evalScripts: true, method: 'get', 
-        parameters: this.param_name + '=' + this.tags_string()}); return false;
+        parameters: this.param_name + '=' + 
+        this.hidden_tags_string()}); return false;
   },
 
   // Rendering


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.