ecm_products 2.0.8.pre → 2.0.9.pre

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,4 +1,4 @@
1
- Copyright 2012 Roberto Vásquez Angel
1
+ Copyright 2013 Roberto Vásquez Angel
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
@@ -97,6 +97,11 @@ class Ecm::Products::Product < ActiveRecord::Base
97
97
  validates :markup_language, :presence => true,
98
98
  :inclusion => Ecm::Products::Configuration.markup_languages
99
99
 
100
+ # publid methods
101
+ def to_s
102
+ name
103
+ end
104
+
100
105
  # private methods
101
106
 
102
107
  private
@@ -1,3 +1,4 @@
1
+ <% content_for(:title, Ecm::Products::ProductCategory.model_name.human(:count => :other)) %>
1
2
  <h1><%= Ecm::Products::ProductCategory.model_name.human(:count => :other) %></h1>
2
3
 
3
4
  <%= nested_li(@product_categories, { :tree_css_class => 'tree unstyled' }) do |pc, level| %>
@@ -1,3 +1,4 @@
1
+ <% content_for(:title, @product_category) %>
1
2
  <%= render @product_category %>
2
3
 
3
4
  <br />
@@ -8,13 +9,13 @@
8
9
  <i class="icon-arrow-left"></i>
9
10
  <%= t('ecm.products.product_category.actions.back_to_index') %>
10
11
  <% end %>
11
-
12
+
12
13
  <% else %>
13
14
 
14
15
  <%= link_to(@product_category.parent, :class => 'back-link btn') do %>
15
16
  <i class="icon-arrow-left"></i>
16
17
  <%= t('ecm.products.product_category.actions.back_to_parent', :name => @product_category.parent.to_s) %>
17
18
  <% end %>
18
-
19
+
19
20
  <% end %>
20
21
 
@@ -1,7 +1,7 @@
1
1
  <li class="span44 offset">
2
2
  <div class="thumbnail">
3
3
  <%= link_to(product_picture.image.url, { :class => "top_up" }) do %>
4
- <%= image_tag(product_picture.image.url(:default)) %>
4
+ <%= image_tag(product_picture.image.url(:medium_thumb)) %>
5
5
  <% end %>
6
6
  <div class="caption">
7
7
  <%= mu(product_picture, :description) %>
@@ -1,3 +1,4 @@
1
- <h1>Ecm::Products::Products#index</h1>
1
+ <% content_for(:title, Ecm::Products::Product.model_name.human(:count => :other)) %>
2
+ <h1><%= Ecm::Products::Product.model_name.human(:count => :other) %></h1>
2
3
 
3
4
  <%= render :partial => "product_preview", :collection => @products, :as => :product %>
@@ -1 +1,2 @@
1
+ <% content_for(:title, @product) %>
1
2
  <%= render :partial => 'product_details', :locals => { :product => @product } %>
@@ -1,4 +1,4 @@
1
- module ECM
1
+ module Ecm
2
2
  module Products
3
3
  class Engine < ::Rails::Engine
4
4
  # active admin
@@ -1,5 +1,5 @@
1
- module ECM
1
+ module Ecm
2
2
  module Products
3
- VERSION = "2.0.8.pre"
3
+ VERSION = "2.0.9.pre"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ecm_products
3
3
  version: !ruby/object:Gem::Version
4
- hash: 961915972
4
+ hash: 961915968
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
- - 8
9
+ - 9
10
10
  - pre
11
- version: 2.0.8.pre
11
+ version: 2.0.9.pre
12
12
  platform: ruby
13
13
  authors:
14
14
  - Roberto Vasquez Angel
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2012-10-25 00:00:00 Z
19
+ date: 2013-02-12 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  name: rails
@@ -26,12 +26,12 @@ dependencies:
26
26
  requirements:
27
27
  - - ~>
28
28
  - !ruby/object:Gem::Version
29
- hash: 1
29
+ hash: 25
30
30
  segments:
31
31
  - 3
32
32
  - 2
33
- - 7
34
- version: 3.2.7
33
+ - 11
34
+ version: 3.2.11
35
35
  type: :runtime
36
36
  version_requirements: *id001
37
37
  - !ruby/object:Gem::Dependency
@@ -156,12 +156,14 @@ dependencies:
156
156
  requirement: &id010 !ruby/object:Gem::Requirement
157
157
  none: false
158
158
  requirements:
159
- - - ">="
159
+ - - <
160
160
  - !ruby/object:Gem::Version
161
161
  hash: 3
162
162
  segments:
163
163
  - 0
164
- version: "0"
164
+ - 7
165
+ - 0
166
+ version: 0.7.0
165
167
  type: :runtime
166
168
  version_requirements: *id010
167
169
  - !ruby/object:Gem::Dependency
@@ -285,13 +287,12 @@ dependencies:
285
287
  requirement: &id019 !ruby/object:Gem::Requirement
286
288
  none: false
287
289
  requirements:
288
- - - ~>
290
+ - - ">="
289
291
  - !ruby/object:Gem::Version
290
292
  hash: 3
291
293
  segments:
292
- - 2
293
294
  - 0
294
- version: "2.0"
295
+ version: "0"
295
296
  type: :development
296
297
  version_requirements: *id019
297
298
  - !ruby/object:Gem::Dependency
@@ -310,7 +311,7 @@ dependencies:
310
311
  type: :development
311
312
  version_requirements: *id020
312
313
  - !ruby/object:Gem::Dependency
313
- name: ffaker
314
+ name: shoulda-matchers
314
315
  prerelease: false
315
316
  requirement: &id021 !ruby/object:Gem::Requirement
316
317
  none: false
@@ -352,35 +353,21 @@ dependencies:
352
353
  type: :development
353
354
  version_requirements: *id023
354
355
  - !ruby/object:Gem::Dependency
355
- name: shoulda-matchers
356
+ name: rb-inotify
356
357
  prerelease: false
357
358
  requirement: &id024 !ruby/object:Gem::Requirement
358
359
  none: false
359
360
  requirements:
360
- - - ">="
361
+ - - ~>
361
362
  - !ruby/object:Gem::Version
362
- hash: 3
363
+ hash: 47
363
364
  segments:
364
365
  - 0
365
- version: "0"
366
+ - 8
367
+ - 8
368
+ version: 0.8.8
366
369
  type: :development
367
370
  version_requirements: *id024
368
- - !ruby/object:Gem::Dependency
369
- name: forgery
370
- prerelease: false
371
- requirement: &id025 !ruby/object:Gem::Requirement
372
- none: false
373
- requirements:
374
- - - "="
375
- - !ruby/object:Gem::Version
376
- hash: 11
377
- segments:
378
- - 0
379
- - 5
380
- - 0
381
- version: 0.5.0
382
- type: :development
383
- version_requirements: *id025
384
371
  description: Product management for active admin.
385
372
  email:
386
373
  - roberto@vasquez-angel.de