fix: server

diff --git a/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee b/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee
index cbc2ae2..ab61685 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee
@@ -8,6 +8,9 @@ class Locmare.FormModule.FieldModule.TagModule.HiddenTag extends Locmare.FormMod
   val: () ->\r
     parseInt(super)  # humm... \r
   \r
+  type: () ->\r
+    'hidden'\r
+  \r
   attr: () ->\r
     r = super()\r
     r['value'] = @value()\r

diff --git a/app/assets/javascripts/locmare/form/field/tag/text.js.coffee b/app/assets/javascripts/locmare/form/field/tag/text.js.coffee
index 8714eb3..8971e12 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/tag/text.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/text.js.coffee
@@ -13,3 +13,10 @@ class Locmare.FormModule.FieldModule.TagModule.TextTag extends Locmare.FormModul
   change: () ->\r
     @field.trigger('change')\r
   \r
+  attr: () ->\r
+    r = super()\r
+    sz = @options()['size']\r
+    if sz\r
+      r['size'] = sz\r
+    r\r
+  \r

diff --git a/app/controllers/comic_stories_controller.rb b/app/controllers/comic_stories_controller.rb
index 54ac355..120935b 100644 (file)
--- a/app/controllers/comic_stories_controller.rb
+++ b/app/controllers/comic_stories_controller.rb
@@ -59,7 +59,7 @@ class ComicStoriesController < ApplicationController
   end
   
   def update
-    @my_model_class = self.class.model
+    set_model
     @item = @my_model_class.edit(params[:id], @operators)
     ot = @item.t
     @item.attributes = params[@item.item_name]
@@ -76,7 +76,7 @@ class ComicStoriesController < ApplicationController
     set_model
     @item = @my_model_class.edit(params[:id], @operators)
     @binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
-    render_destroy '/home/' + play_comic_path(@item)
+    render_destroy play_comic_path(@binder)
   end
   
 end

diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb
index 06f5687..c27442a 100644 (file)
--- a/app/controllers/folders_controller.rb
+++ b/app/controllers/folders_controller.rb
@@ -77,7 +77,7 @@ class FoldersController < ApplicationController
   def destroy
     set_model
     @item = @my_model_class.edit(params[:id], @operators)
-    render_destroy @my_model_class.path_name
+    render_destroy '/' + @my_model_class.path_name
   end
   
 end

diff --git a/app/controllers/license_groups_controller.rb b/app/controllers/license_groups_controller.rb
index e98832d..c4c487f 100644 (file)
--- a/app/controllers/license_groups_controller.rb
+++ b/app/controllers/license_groups_controller.rb
@@ -59,7 +59,7 @@ class LicenseGroupsController < ApplicationController
   def destroy
     set_model
     @item = @my_model_class.edit(params[:id], @operators)
-    render_destroy @my_model_class.path_name
+    render_destroy '/' + @my_model_class.path_name
   end
   
 end

diff --git a/app/controllers/licenses_controller.rb b/app/controllers/licenses_controller.rb
index 66b0423..cd697dd 100644 (file)
--- a/app/controllers/licenses_controller.rb
+++ b/app/controllers/licenses_controller.rb
@@ -69,7 +69,7 @@ class LicensesController < ApplicationController
   def destroy
     set_model
     @item = @my_model_class.edit(params[:id], @operators)
-    render_destroy @my_model_class.path_name
+    render_destroy '/' + @my_model_class.path_name
   end
   
 end

diff --git a/app/controllers/scroll_panels_controller.rb b/app/controllers/scroll_panels_controller.rb
index ffcee61..a35d0b3 100644 (file)
--- a/app/controllers/scroll_panels_controller.rb
+++ b/app/controllers/scroll_panels_controller.rb
@@ -72,7 +72,7 @@ class ScrollPanelsController < ApplicationController
     set_model
     @item = @my_model_class.edit(params[:id], @operators)
     @binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
-    render_destroy '/home/' + play_scroll_path(@item)
+    render_destroy play_scroll_path(@binder)
   end
   
 end

diff --git a/app/controllers/sheet_panels_controller.rb b/app/controllers/sheet_panels_controller.rb
index 752fb28..aaa1969 100644 (file)
--- a/app/controllers/sheet_panels_controller.rb
+++ b/app/controllers/sheet_panels_controller.rb
@@ -42,59 +42,4 @@ class SheetPanelsController < ApplicationController
     form_edit
   end
   
-  def create
-    @sheet_panel = SheetPanel.new 
-    @sheet_panel.supply_default
-    @sheet_panel.attributes = params[:sheet_panel]
-    @sheet_panel.overwrite @operators
-    @sheet = Sheet.edit(@sheet_panel.sheet_id, @operators) if @sheet_panel.sheet_id
-    @panel = Panel.show(@sheet_panel.panel_id, @operators) if @sheet_panel.panel_id
-    
-    respond_to do |format|
-      if @sheet_panel.store @operators
-        flash[:notice] = I18n.t('flash.notice.created', :model => SheetPanel.model_name.human)
-        format.html { redirect_to play_sheet_path(@sheet) }
-        format.json { render json: @sheet_panel.sheet_panel_as_json(@operators.author) }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => SheetPanel.model_name.human)
-        format.html { render action: "new" }
-        format.json { render json: @sheet_panel.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-  
-  def update
-    @sheet_panel = SheetPanel.edit(params[:id], @operators)
-    ot = @sheet_panel.t
-    @sheet_panel.attributes = params[:sheet_panel]
-    @sheet_panel.overwrite @operators
-    @sheet = Sheet.edit(@sheet_panel.sheet_id, @operators) if @sheet_panel.sheet_id
-    respond_to do |format|
-      if @sheet_panel.store @operators, ot
-        flash[:notice] = I18n.t('flash.notice.updated', :model => SheetPanel.model_name.human)
-        format.html { redirect_to play_sheet_path(@sheet) }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => SheetPanel.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @sheet_panel.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def destroy
-    @sheet_panel = SheetPanel.edit(params[:id], @operators)
-    @sheet = Sheet.edit(@sheet_panel.sheet_id, @operators) if @sheet_panel.sheet_id
-    respond_to do |format|
-      if @sheet_panel.destroy_and_shorten
-        flash[:notice] = I18n.t('flash.notice.destroyed', :model => SheetPanel.model_name.human)
-        format.html { redirect_to play_sheet_path(@sheet) }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => SheetPanel.model_name.human)
-        format.html { redirect_to sheet_panel_path(@sheet_panel) }
-        format.json { render json: @sheet_panel.errors, status: :unprocessable_entity }
-      end
-    end
-  end
 end

diff --git a/app/controllers/speech_balloon_templates_controller.rb b/app/controllers/speech_balloon_templates_controller.rb
index 8fffffd..2499e6e 100644 (file)
--- a/app/controllers/speech_balloon_templates_controller.rb
+++ b/app/controllers/speech_balloon_templates_controller.rb
@@ -46,7 +46,7 @@ class SpeechBalloonTemplatesController < ApplicationController
   def destroy
     set_model
     @item = @my_model_class.edit(params[:id], @operators)
-    render_destroy @my_model_class.path_name
+    render_destroy '/' + @my_model_class.path_name
   end
   
 end

diff --git a/app/controllers/story_sheets_controller.rb b/app/controllers/story_sheets_controller.rb
index 887f4e8..262b5da 100644 (file)
--- a/app/controllers/story_sheets_controller.rb
+++ b/app/controllers/story_sheets_controller.rb
@@ -43,7 +43,7 @@ class StorySheetsController < ApplicationController
   end
   
   def create
-    @my_model_class = self.class.model
+    set_model
     @item = @my_model_class.new
     @item.supply_default
     @item.attributes = params[@item.item_name]
@@ -55,7 +55,7 @@ class StorySheetsController < ApplicationController
   end
   
   def update
-    @my_model_class = self.class.model
+    set_model
     @item = @my_model_class.edit(params[:id], @operators)
     ot = @item.t
     @item.attributes = params[@item.item_name]
@@ -72,7 +72,7 @@ class StorySheetsController < ApplicationController
     set_model
     @item = @my_model_class.edit(params[:id], @operators)
     @binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
-    render_destroy '/home/' + play_story_path(@item)
+    render_destroy play_story_path(@binder)
   end
   
 end

diff --git a/app/controllers/writing_formats_controller.rb b/app/controllers/writing_formats_controller.rb
index d215aec..0e4c663 100644 (file)
--- a/app/controllers/writing_formats_controller.rb
+++ b/app/controllers/writing_formats_controller.rb
@@ -60,7 +60,7 @@ class WritingFormatsController < ApplicationController
   def destroy
     set_model
     @item = @my_model_class.edit(params[:id], @operators)
-    render_destroy @my_model_class.path_name
+    render_destroy '/' + @my_model_class.path_name
   end
   
 end

diff --git a/app/models/comic_story.rb b/app/models/comic_story.rb
index 59b8096..12213ba 100644 (file)
--- a/app/models/comic_story.rb
+++ b/app/models/comic_story.rb
@@ -15,7 +15,6 @@ class ComicStory < Peta::Leaf
   end
   
   def overwrite operators
-    return false unless operators.author
   end
   
   def disp_t

diff --git a/app/models/license_group.rb b/app/models/license_group.rb
index 2fa5f67..61c6179 100644 (file)
--- a/app/models/license_group.rb
+++ b/app/models/license_group.rb
@@ -33,6 +33,19 @@ class LicenseGroup < Peta::Template
     r
   end
   
+  # destroy with licenses
+  def destroy
+    res = false
+    self.class.transaction do
+      self.licenses.each do |license|
+        raise ActiveRecord::Rollback unless license.destroy
+      end
+      res = super
+      raise ActiveRecord::Rollback unless res
+    end
+    res
+  end
+  
   def self.import filename
     LicenseGroup.import_file(filename) {|name, attr| LicenseGroup.store(name, attr)}
   end

diff --git a/app/models/sheet_panel.rb b/app/models/sheet_panel.rb
index 4acf27c..fa0c1b6 100644 (file)
--- a/app/models/sheet_panel.rb
+++ b/app/models/sheet_panel.rb
@@ -30,6 +30,9 @@ class SheetPanel < Peta::Element
     end
   end
   
+  def overwrite
+  end
+  
   def self.by_author_list_includes
     {
       :sheet => {

diff --git a/app/models/story_sheet.rb b/app/models/story_sheet.rb
index 6acadc8..0d09dcb 100644 (file)
--- a/app/models/story_sheet.rb
+++ b/app/models/story_sheet.rb
@@ -13,6 +13,9 @@ class StorySheet < Peta::Leaf
     self.t = nil
   end
   
+  def overwrite operators
+  end
+  
   def self.public_list_where list
     'stories.visible > 0'
   end

diff --git a/app/views/scroll_panels/_footer.html.erb b/app/views/scroll_panels/_footer.html.erb
index 02b3cf7..e68dace 100644 (file)
--- a/app/views/scroll_panels/_footer.html.erb
+++ b/app/views/scroll_panels/_footer.html.erb
@@ -8,7 +8,7 @@
       <% end %>
     </td>
     <td>
-      <%= link_to scroll_panel_icon(:object => scroll_panel, :size => 25), scroll_panel_path(scroll_panel) %>
+      <%= scroll_panel_icon(:object => scroll_panel, :size => 25) %>
       <%= link_to author_icon(:object => scroll_panel.scroll.author, :size => 17), author_path(scroll_panel.scroll.author) %>
       <%= l scroll_panel.updated_at %>
     </td>
@@ -19,5 +19,8 @@
         No.<%= scroll_panel.t %>
       <% end %>
     </td>
+    <td>
+      <%= link_to tag(:img, {:src => '/images/remove.png', :width => Manifest.manifest.magic_numbers['thumbnail_width'] / 2, :height => Manifest.manifest.magic_numbers['thumbnail_height'] / 2}), scroll_panel, confirm: 'Are you sure?', :method => :delete %>
+    </td>
   </tr>
 </table>

diff --git a/app/views/sheet_panels/_play_footer.html.erb b/app/views/sheet_panels/_play_footer.html.erb
index bd930e0..7d42a8f 100644 (file)
--- a/app/views/sheet_panels/_play_footer.html.erb
+++ b/app/views/sheet_panels/_play_footer.html.erb
@@ -7,7 +7,7 @@
       <% end %>
     </td>
     <td>
-      <%= link_to sheet_panel_icon(:object => sheet_panel, :size => 25), sheet_panel_path(sheet_panel) %>
+      <%= sheet_panel_icon(:object => sheet_panel, :size => 25) %>
       <%= link_to author_icon(:object => sheet_panel.panel.author, :size => 17), author_path(sheet_panel.panel.author) %>
     </td>
     <td>

diff --git a/app/views/sheets/play.html.erb b/app/views/sheets/play.html.erb
index 464deab..707defb 100644 (file)
--- a/app/views/sheets/play.html.erb
+++ b/app/views/sheets/play.html.erb
@@ -9,10 +9,4 @@
   </div>
 <% end %>
 <% if @item.own? @operators -%>
-  <h3><%= t('sheet_panels.append.new_panels') -%></h3>
-  <table>
-    <% @new_panel_items.each do |panel| %>
-      <%= render 'sheet_panels/append_panel', :sheet => @item, :panel => panel, :operators => @operators %>
-    <% end %>
-  </table>
 <% end %>

diff --git a/lib/peta/leaf.rb b/lib/peta/leaf.rb
index 0245766..4ed0c3c 100644 (file)
--- a/lib/peta/leaf.rb
+++ b/lib/peta/leaf.rb
@@ -182,9 +182,11 @@ module Peta
       res
     end
     
+    # destroy and shorten
     def destroy
       res = false
       self.class.transaction do
+        # renumber t
         self.class.update_all('t = t - 1', 
           [self.binder_key + ' = ? and (t > ?)', self.binder_id, self.t]
         )