From fb42dde11a2dd2530b5418f3182fc2b67e4285a8 Mon Sep 17 00:00:00 2001
From: yasushiito <yas@pen-chan.jp>
Date: Mon, 20 Apr 2015 14:04:38 +0900
Subject: [PATCH] fix: success create panel

---
 app/assets/javascripts/controllers/panels.js.coffee               | 4 +++-
 app/assets/javascripts/editor/panel_editor/dock.js.coffee         | 2 +-
 app/assets/javascripts/locmare/form.js.coffee                     | 1 +
 app/assets/javascripts/locmare/list_group/lib/pager.js.coffee     | 2 +-
 app/assets/javascripts/models/panel.js.coffee                     | 6 +++++-
 app/assets/javascripts/views/panel_pictures/new_element.js.coffee | 1 +
 app/controllers/panels_controller.rb                              | 1 -
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/controllers/panels.js.coffee b/app/assets/javascripts/controllers/panels.js.coffee
index 2677540e..6fae87a1 100644
--- a/app/assets/javascripts/controllers/panels.js.coffee
+++ b/app/assets/javascripts/controllers/panels.js.coffee
@@ -52,7 +52,9 @@ class Pettanr.PanelsController extends Pettanr.AppController
   
   new: () ->
     @trigger('title', @params)
-    @form_new()
+    @set_new()
+    @item = @item.with_elements()
+    @render_form()
     @trigger('done', @params)
   
   edit: () ->
diff --git a/app/assets/javascripts/editor/panel_editor/dock.js.coffee b/app/assets/javascripts/editor/panel_editor/dock.js.coffee
index 1dd0ceb6..bb2b3d2c 100644
--- a/app/assets/javascripts/editor/panel_editor/dock.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor/dock.js.coffee
@@ -98,7 +98,7 @@ class Editor.PanelEditor.Dock extends Editor.EditorModule.DockBase
   
   pick: (new_item) ->
     t = @scenario_bay.length()
-    z = @element_bay.new_tab.label.z() + 1
+    z = @element_bay.new_tab.label.z()
     new_item.set({z: z, t: t}, {silent: true})
     @scenario_bay.add_element(new_item)
     @trigger('add:element', new_item)
diff --git a/app/assets/javascripts/locmare/form.js.coffee b/app/assets/javascripts/locmare/form.js.coffee
index 879ec6a0..475d1166 100644
--- a/app/assets/javascripts/locmare/form.js.coffee
+++ b/app/assets/javascripts/locmare/form.js.coffee
@@ -195,6 +195,7 @@ class Locmare.Form extends Locmare.FormBase
     attrs = {}
     _.each @fields, (field) =>
       attrs[field.field_name] = @item.get(field.field_name)
+    delete attrs['id'] if @item.isNew()
     _.each @child_forms, (child_form, name) =>
       mm = @item.my_class().my_manifest()
       em = child_form.item.my_class().my_manifest()
diff --git a/app/assets/javascripts/locmare/list_group/lib/pager.js.coffee b/app/assets/javascripts/locmare/list_group/lib/pager.js.coffee
index efbc3d76..edf41e4c 100644
--- a/app/assets/javascripts/locmare/list_group/lib/pager.js.coffee
+++ b/app/assets/javascripts/locmare/list_group/lib/pager.js.coffee
@@ -112,7 +112,7 @@ class Locmare.ListGroupModule.LibModule.PagerModule.Default extends Backbone.Vie
     @trigger('page', page)
   
   navigate: (url) ->
-    @trigger('navigate', url)
+    @trigger('http_get', url)
   
 class Locmare.ListGroupModule.LibModule.PagerModule.Part extends Backbone.View
   tagName: 'li'
diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee
index 2ece658b..b1f87413 100644
--- a/app/assets/javascripts/models/panel.js.coffee
+++ b/app/assets/javascripts/models/panel.js.coffee
@@ -60,7 +60,11 @@ class Pettanr.Panel extends Peta.Root
     r
   
   my_url: () ->
-    '/' + @path_name() + '/' + @get('id')
+    s = if @get('id')
+      '/' + @get('id')
+    else
+      ''
+    '/' + @path_name() + s
   
   initialize: (attr = {}, options = {}) ->
     super(attr, options)
diff --git a/app/assets/javascripts/views/panel_pictures/new_element.js.coffee b/app/assets/javascripts/views/panel_pictures/new_element.js.coffee
index 46aa767c..3a131304 100644
--- a/app/assets/javascripts/views/panel_pictures/new_element.js.coffee
+++ b/app/assets/javascripts/views/panel_pictures/new_element.js.coffee
@@ -33,6 +33,7 @@ class Pettanr.Views.PanelPicture.NewElement extends Backbone.View
       # Pick  resource_picture to panel_picture
       new_item = new @target_model()
       new_item.set(new_item.pick(item), {silent: true})
+      new_item.set({x: 0, y: 0}, {silent: true})
     @dialog().stop()
     @trigger('pick', new_item)
   
diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 376c68cc..ad67b3e5 100644
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -136,7 +136,6 @@ class PanelsController < ApplicationController
     end
     @prm = params[:panel] || jsn
     @item.class.fold_extend_settings @prm
-    @item.attributes = @prm
     # @item.refresh
     respond_to do |format|
       if @item.store @prm, @operators
-- 
2.11.0