fix any

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee
index 094afbd..e122aac 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee
@@ -6,21 +6,16 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo
     @link = m.LinkFactory.factory this, @my_manifest.link, @item\r
   \r
   render: () ->\r
-    this.$el.html(@renderer().render().el)\r
-    @delegateEvents({\r
-      'click .face': 'show'\r
-    })\r
+    if @my_manifest.link.type == 'none'\r
+      this.$el.html(@face.render().el)\r
+    else\r
+      this.$el.html(@link.render().el)\r
+      @delegateEvents({'click .face': 'show'}) \r
     this\r
   \r
   show: () ->\r
     window.router.navigate(@link.url(), true);\r
     return false\r
-    \r
-  renderer: () ->\r
-    if @my_manifest.link.type == 'none'\r
-      @face\r
-    else\r
-      @link\r
   \r
 class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.DefaultModule\r
   \r

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee
index 23a22a3..1a5504e 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee
@@ -6,20 +6,15 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol
     @link = m.LinkFactory.factory this, @my_manifest.link, @item\r
   \r
   render: () ->\r
-    this.$el.html(@renderer().render().el)\r
-    @delegateEvents({\r
-      'click .face': 'show'\r
-    })\r
+    if @my_manifest.link.type == 'none'\r
+      this.$el.html(@face.render().el)\r
+    else\r
+      this.$el.html(@link.render().el)\r
+      @delegateEvents({'click .face': 'show'}) \r
     this\r
   \r
   show: () ->\r
     window.router.navigate(@link.url(), true)\r
     return false\r
-    \r
-  renderer: () ->\r
-    if @my_manifest.link.type == 'none'\r
-      @face\r
-    else\r
-      @link\r
   \r
 class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.DefaultModule\r

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/template.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/template.js.coffee
index ab02ef1..8c0110c 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/template.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/template.js.coffee
@@ -2,19 +2,22 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol
   \r
   initialize: (options) ->\r
     super(options)\r
+    @face = new Pettanr.Views[@item.singular()].Symbol({\r
+      item: @item\r
+    })\r
   \r
-  column_template_file_name: () ->\r
-    'show'\r
+  render: () ->\r
+    this.$el.html(@face.render().el)\r
+    @delegateEvents({\r
+      'click .face': 'show'\r
+    })\r
+    this\r
   \r
-  item_template_file_name: () ->\r
-    'template'\r
-  \r
-  template_dir: () ->\r
-    @item.path_name() + '-'\r
-  \r
-  template_file_name: () ->\r
-    @my_manifest.template_name()\r
-  \r
-  template_name: () ->\r
-    @template_dir() + @template_file_name()\r
+  show: () ->\r
+    # unique template\r
+    window.router.navigate(@url(), true)\r
+    return false\r
+    \r
+  url: () ->\r
+    Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')})\r
   \r

diff --git a/app/assets/javascripts/locmare/form.js.coffee b/app/assets/javascripts/locmare/form.js.coffee
index 7bff35d..27ccbb0 100644 (file)
--- a/app/assets/javascripts/locmare/form.js.coffee
+++ b/app/assets/javascripts/locmare/form.js.coffee
@@ -38,9 +38,6 @@ class Locmare.FormBase extends Backbone.View
     '/images/'\r
   \r
 class Locmare.Form extends Locmare.FormBase\r
-  events: {\r
-    'submit': 'post'\r
-  }\r
   \r
   initialize: (options) ->\r
     super(options)\r
@@ -50,12 +47,12 @@ class Locmare.Form extends Locmare.FormBase
     @init_fields()\r
   \r
   render: () ->\r
-    m = if @item.isNew()\r
+    method_type = if @item.isNew()\r
       'post'\r
     else\r
       'put'\r
     @attr = {\r
-      method: m,\r
+      method: method_type,\r
       action: @action\r
     }\r
     this.$el.attr(@attr)\r
@@ -70,6 +67,7 @@ class Locmare.Form extends Locmare.FormBase
       c = @submit_class()\r
       @div_submit = new c({form: this})\r
       this.$el.append(@div_submit.render().el)\r
+      @delegateEvents({'submit': method_type})\r
     this\r
   \r
   init_fields: () ->\r
@@ -108,7 +106,6 @@ class Locmare.Form extends Locmare.FormBase
     @submits()[@submit]\r
   \r
   post: () ->\r
-    attr = {}\r
     _this = this\r
     _.each @fields, (field) ->\r
       _this.item.set(field.field_name, field.val())\r
@@ -118,6 +115,17 @@ class Locmare.Form extends Locmare.FormBase
     else\r
       alert('invalid')\r
   \r
+  put: () ->\r
+    _this = this\r
+    _.each @fields, (field) ->\r
+      _this.item.set(field.field_name, field.val())\r
+    @item.overwrite({operators: @operators})\r
+    if @item.save()\r
+      window.router.navigate('/' + @item.table_name() + '/' + Pettanr.to_s(@item.get('id')), true)\r
+      return false\r
+    else\r
+      alert('invalid')\r
+  \r
 class Locmare.ExtendForm extends Locmare.FormBase\r
   tagName: 'div'\r
   className: 'fields'\r

diff --git a/app/assets/javascripts/locmare/form/field.js.coffee b/app/assets/javascripts/locmare/form/field.js.coffee
index d3a3f26..476216b 100644 (file)
--- a/app/assets/javascripts/locmare/form/field.js.coffee
+++ b/app/assets/javascripts/locmare/form/field.js.coffee
@@ -32,7 +32,7 @@ class Locmare.FormModule.Field extends Backbone.View
     @form.item\r
   \r
   val: () ->\r
-    @tag.$el.val()\r
+    @tag.val()\r
   \r
   value: () ->\r
     @item().get(@field_manifest.column_name())\r

diff --git a/app/assets/javascripts/locmare/form/field/tag/base.js.coffee b/app/assets/javascripts/locmare/form/field/tag/base.js.coffee
index 743f80a..b04e2ca 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/tag/base.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/base.js.coffee
@@ -9,7 +9,10 @@ class Locmare.FormModule.FieldModule.TagModule.Base extends Backbone.View
     @field.form_field_name()\r
   \r
   val: () ->\r
-    this.$el.val()\r
+    if Pettanr.is_blank(this.$el.val())\r
+      null\r
+    else\r
+      this.$el.val()\r
   \r
   value: () ->\r
     @field.value()\r

diff --git a/app/assets/javascripts/models/scroll.js.coffee b/app/assets/javascripts/models/scroll.js.coffee
index 9447642..5070dad 100644 (file)
--- a/app/assets/javascripts/models/scroll.js.coffee
+++ b/app/assets/javascripts/models/scroll.js.coffee
@@ -12,6 +12,11 @@ class Pettanr.Scroll extends Peta.Binder
     visible: 0\r
   } \r
   \r
+  overwrite: (options) ->\r
+    operators = options.operators\r
+    return false if not operators.author\r
+    @set('author_id', operators.author.id)\r
+  \r
   initialize: () ->\r
     if @id\r
       @url = @url + @id\r

diff --git a/app/assets/javascripts/pettanr.js.coffee b/app/assets/javascripts/pettanr.js.coffee
index 3c53f20..3aeeaa5 100644 (file)
--- a/app/assets/javascripts/pettanr.js.coffee
+++ b/app/assets/javascripts/pettanr.js.coffee
@@ -135,7 +135,8 @@ class Pettanr
       @set_model()\r
       @item = new @my_model_class({id: @params['id']})\r
       @item.boosts 'post'\r
-      @item.supply_default()\r
+      # Backbone.Model has defaults property\r
+      #@item.supply_default()\r
     \r
     set_edit: () ->\r
       @set_model()\r

diff --git a/app/assets/javascripts/views/ground_colors/symbol.js.coffee b/app/assets/javascripts/views/ground_colors/symbol.js.coffee
new file mode 100644 (file)
index 0000000..01cf55a
--- /dev/null
+++ b/app/assets/javascripts/views/ground_colors/symbol.js.coffee
@@ -0,0 +1,33 @@
+class Pettanr.Views.GroundColor.Symbol extends Backbone.View\r
+  tagName: 'div'\r
+  className: 'face'\r
+  \r
+  initialize: (options) ->\r
+    @item = options.item\r
+  \r
+  render: () ->\r
+    this.$el.html(@fore_color())\r
+    attr = {\r
+      style: Pettanr.to_style(@style())\r
+    }\r
+    this.$el.attr(attr)\r
+    this\r
+  \r
+  fore_color: () ->\r
+    c = @item.get('code') ^ 0xffffff\r
+    ('000000' + c.toString(16)).slice(-6)\r
+    \r
+  bg_color: () ->\r
+    c = @item.get('code')\r
+    ('000000' + c.toString(16)).slice(-6)\r
+    \r
+  style: (spot = null, opacity = 20) ->\r
+    width = Manifest.manifest().magic_numbers['thumbnail_width']\r
+    height = Manifest.manifest().magic_numbers['thumbnail_height']\r
+    {\r
+      width: Pettanr.to_s(width) + 'px', \r
+      height: Pettanr.to_s(height) + 'px', \r
+      color: '#' + @fore_color()\r
+      'background-color': '#' + @bg_color()\r
+    }\r
+  \r

diff --git a/db/migrate/20140409094921_fix_ext_sys_pict.rb b/db/migrate/20140409094921_fix_ext_sys_pict.rb
index dfd15a0..6952897 100644 (file)
--- a/db/migrate/20140409094921_fix_ext_sys_pict.rb
+++ b/db/migrate/20140409094921_fix_ext_sys_pict.rb
@@ -3,13 +3,13 @@ class FixExtSysPict < ActiveRecord::Migration
     rename_column :resource_pictures, :classname, :license_group_classname
     rename_column :resource_pictures, :credit, :license_settings
     rename_column :resource_pictures, :settings, :license_group_settings
- #   add_column :resource_pictures, :license_group_id, :integer, :null => false, :default => 0
+    add_column :resource_pictures, :license_group_id, :integer, :null => false, :default => 0
     add_column :resource_pictures, :credit_picture_settings, :string
     
     rename_column :pictures, :classname, :license_group_classname
     rename_column :pictures, :credit, :license_settings
     rename_column :pictures, :settings, :license_group_settings
- #   add_column :pictures, :license_group_id, :integer, :null => false, :default => 0
+    add_column :pictures, :license_group_id, :integer, :null => false, :default => 0
     add_column :pictures, :credit_picture_settings, :string
   end