lolita-file-upload 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/app/views/components/lolita/configuration/tab/files/_cells.html.erb

@@ -6,6 +6,6 @@
   <% end %>
 </td>
 <td style="margin-top: 3px; border-bottom: 2px solid #E1E1E1; width: 55px;text-align: center; font-size: 14px; padding: 7px 20px; vertical-align: middle;">
-  <%= link_to  image_tag("edit.png"),send(:"edit_lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => resource.nil? ? 0 : resource.id, :association => tab.association.name, :id=>file),:remote=>true %>
-  <%= link_to image_tag("delete_picture.png"),send(:"lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => resource.nil? ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:method=>:delete,:remote=>true,:confirm=>"Are you sure?" %>
+  <%= link_to  image_tag("edit.png"),send(:"edit_lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:remote=>true %>
+  <%= link_to image_tag("delete_picture.png"),send(:"lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:method=>:delete,:remote=>true,:confirm=>"Are you sure?" %>
 </td>

data/config/locales/en.yml

@@ -3,6 +3,9 @@ en:
     upload:
       errors:
         "file too big": "file too big (max %{value} %{unit})"
+    tabs:
+      titles:
+        files: "Files"
     support:
       bytes:
         byte:

data/config/locales/lv.yml

@@ -0,0 +1,8 @@
+lv:
+  lolita:
+    upload:
+      errors:
+        "file too big": "fails par lielu (maksimums %{value} %{unit})"
+    tabs:
+      titles:
+        files: "Faili"

data/lib/lolita-file-upload/configuration/tab/files.rb

@@ -17,7 +17,7 @@ module Lolita
   	  		@filters=[]
           @dbi=dbi
           @editable_fields=[]
-          set_default_uploader
+          set_default_association
   	  		super
   	  	end
 
@@ -41,11 +41,7 @@ module Lolita
   	  	end
 
         def uploader name=nil
-          if name
-            @uploader = name.to_sym
-            @association = self.dbi.klass
-            @association_type = :self
-          end
+          @uploader = name.to_sym if name
           @uploader
         end
 
@@ -77,16 +73,6 @@ module Lolita
           self.association_dbi.fields.collect{|field| field[:name] if field[:type] == "string"}.compact
         end
 
-        def set_default_uploader
-          unless self.dbi.klass.uploaders.empty?
-            @uploader = self.dbi.klass.uploaders.keys.first
-            @association = self.dbi.klass
-            @association_type = :self
-          else
-            set_default_association
-          end
-        end
-
         def set_default_association
           @association=self.dbi.associations.detect{|k,assoc| !assoc.klass.uploaders.empty? }
           if @association

data/lolita-file-upload.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita-file-upload}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/configuration/tab/files/_update.js.erb",
     "app/views/components/lolita/configuration/tab/files/_upload_script.html.erb",
     "config/locales/en.yml",
+    "config/locales/lv.yml",
     "features/configuration_for_tab.feature",
     "features/connect_with_lolita.feature",
     "features/extend_resources_with_new_routes.feature",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-file-upload
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &73650690 !ruby/object:Gem::Requirement
+  requirement: &88220530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *73650690
+  version_requirements: *88220530
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &73650450 !ruby/object:Gem::Requirement
+  requirement: &88220290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *73650450
+  version_requirements: *88220290
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &73650190 !ruby/object:Gem::Requirement
+  requirement: &88220050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *73650190
+  version_requirements: *88220050
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &73649930 !ruby/object:Gem::Requirement
+  requirement: &88219810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *73649930
+  version_requirements: *88219810
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &73649630 !ruby/object:Gem::Requirement
+  requirement: &88219560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *73649630
+  version_requirements: *88219560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &73649330 !ruby/object:Gem::Requirement
+  requirement: &88219310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *73649330
+  version_requirements: *88219310
 description: File upload gem for Lolita with with fulll integration - models, controller,
   views
 email: support@ithouse.lv
@@ -111,6 +111,7 @@ files:
 - app/views/components/lolita/configuration/tab/files/_update.js.erb
 - app/views/components/lolita/configuration/tab/files/_upload_script.html.erb
 - config/locales/en.yml
+- config/locales/lv.yml
 - features/configuration_for_tab.feature
 - features/connect_with_lolita.feature
 - features/extend_resources_with_new_routes.feature
@@ -187,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -273943267
+      hash: -642418577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: