OSDN Git Service

fix prof
authoryasushiito <yas@pen-chan.jp>
Wed, 11 Jun 2014 01:20:59 +0000 (10:20 +0900)
committeryasushiito <yas@pen-chan.jp>
Wed, 11 Jun 2014 01:20:59 +0000 (10:20 +0900)
app/controllers/stories_controller.rb
config/locales/pettanr.ja.yml
lib/local_manifest/profiler.rb
lib/locmare/list_group/list/system_resource.rb

index baf4181..976ec15 100644 (file)
@@ -56,7 +56,6 @@ class StoriesController < ApplicationController
     @item = self.class.model.show(params[:id], @operators)
     set_play
     play_list
-    p @items
     @sort_items = @list.items(@operators, 
       {:id => params[:id], :my_play => @item.own?(@operators)},
       0, -1 # no limit
index 4de0639..e95d272 100644 (file)
@@ -89,6 +89,8 @@ ja:
         lft: ツリー左
         rgt: ツリー右
         depth: ツリー深さ
+        created_at: 更新
+        updated_at: 作成
       scroll:
         title: タイトル
         description: あらすじ
index c46b497..835dbf1 100644 (file)
@@ -15,7 +15,9 @@ module LocalManifest
       @json['lists'] ||= {}
       @json['associations'] ||= {}
       # supply column configures
-      @json['column_names'] = ['id'] + @json['column_names'] + ['created_at', 'updated_at']
+      @json['column_names'].unshift 'id' unless @json['column_names'].include?('id')
+      @json['column_names'].push 'created_at' unless @json['column_names'].include?('created_at')
+      @json['column_names'].push 'updated_at' unless @json['column_names'].include?('updated_at')
       @json['columns']['created_at'] = {'type' => 'date'}
       @json['columns']['updated_at'] = {'type' => 'date'}
       @json['column_names'].each do |column_name|
index 94b1846..9cc0343 100644 (file)
@@ -9,8 +9,8 @@ module Locmare
       def items operators, options, offset, page_size
         # enable_list does not work when configured auto load in development.rb
         # auto loader undefing MODEL at reload manifest file
-        @model.enable_list
-        super
+        @model.enable_list
+        super
       end
       
     end