togo 0.6.3 → 0.6.4

data/lib/togo/admin/public/js/togo.js

@@ -263,7 +263,7 @@ AssociationManager.prototype.setToModifyState = function() {
 
 AssociationManager.prototype.addLinkToValue = function(id, value, linkIt) {
     if (!linkIt) { return value; }
-    return '<a href="/edit/' + this.model + '/' + id + '">' + value + '</a>';
+    return '<a href="' + this.pathPrefix + '/edit/' + this.model + '/' + id + '">' + value + '</a>';
 };
 
 AssociationManager.prototype.appendRow = function(data) {

data/lib/togo/admin/views/edit.erb

@@ -7,7 +7,7 @@
     <% if @errors %><div id="save_errors" class="errors"><%= @errors %></div><% end %>
     <% @model.get_form_properties.each do |p| %>
     <fieldset id="property-<%= p.name %>" class="<%= @model.field_class_for(p) %>">
-      <%= @model.form_for(p,@content) %>
+      <%= @model.form_for(p,@content,:path_prefix => @path_prefix) %>
     </fieldset>
     <% end %>
   </div>

data/lib/togo/admin/views/new.erb

@@ -7,7 +7,7 @@
     <% if @errors %><div id="save_errors" class="errors"><%= @errors %></div><% end %>
     <% @model.get_form_properties.each do |p| %>
     <fieldset id="property-<%= p.name %>" class="<%= @model.field_class_for(p) %>">
-      <%= @model.form_for(p,@content) %>
+      <%= @model.form_for(p,@content,:path_prefix => @path_prefix) %>
     </fieldset>
     <% end %>
   </div>

data/lib/togo/model/model.rb

@@ -44,7 +44,7 @@ module Togo
         end
 
         # Display the form template for a property
-        def form_for(property,content)
+        def form_for(property,content,opts = {})
           template = class_variable_get(:@@custom_form_templates)[property.name] || File.join(File.dirname(__FILE__),'types',"#{property.type}.erb")
           Erubis::TinyEruby.new(File.open(template).read).result(binding)
         end
@@ -115,7 +115,7 @@ module Togo
 
         def type_from_property(property)
           case property
-            when ::DataMapper::Property::Text
+            when (defined?(::DataMapper::Property::Text) and ::DataMapper::Property::Text)
               'text'
             when (defined?(::DataMapper::Property::Enum) and ::DataMapper::Property::Enum)
               'string'

data/lib/togo/model/types/belongs_to.erb

@@ -43,7 +43,7 @@
               <td class="checkbox"><input type="radio" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
               <% related_model.get_list_properties.each_with_index do |p,i| %>
                 <% v = c.send(p.name) || '-' %>
-                <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= v || '-' %></a><% else %><%= v %><% end %></td>
+                <td><% if i == 0 %><a href="<%= [(opts[:path_prefix] || ''), '/edit/' + related_model.name + '/' + c.id.to_s].join %>"><%= v || '-' %></a><% else %><%= v %><% end %></td>
               <% end %>
             </tr>   
           <% end %>

data/lib/togo/model/types/has_n.erb

@@ -45,7 +45,7 @@
               <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
               <% related_model.get_list_properties.each_with_index do |p,i| %>
                 <% v = c.send(p.name) || '-' %>
-                <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= v %></a><% else %><%= v %><% end %></td>
+                <td><% if i == 0 %><a href="<%= [(opts[:path_prefix] || ''), '/edit/' + related_model.name + '/' + c.id.to_s].join %>"><%= v %></a><% else %><%= v %><% end %></td>
               <% end %>
             </tr>   
           <% end %>

data/lib/togo/model/types/many_to_many.erb

@@ -45,7 +45,7 @@
               <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
               <% related_model.get_list_properties.each_with_index do |p,i| %>
                 <% v = c.send(p.name) || '-' %>
-                <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= v %></a><% else %><%= v %><% end %></td>
+                <td><% if i == 0 %><a href="<%= [(opts[:path_prefix] || ''), '/edit/' + related_model.name + '/' + c.id.to_s].join %>"><%= v %></a><% else %><%= v %><% end %></td>
               <% end %>
             </tr>   
           <% end %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: togo
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Matt King