OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
afb06ab
)
fix: heroku
author
yasushiito
<yas@pen-chan.jp>
Tue, 25 Aug 2015 09:40:18 +0000
(18:40 +0900)
committer
yasushiito
<yas@pen-chan.jp>
Tue, 25 Aug 2015 09:40:18 +0000
(18:40 +0900)
app/assets/javascripts/views/resource_picture_pictures/summary.js.coffee
patch
|
blob
|
history
db/migrate/20140612222717_fix_extend_system_data.rb
patch
|
blob
|
history
lib/peta/leaf.rb
patch
|
blob
|
history
diff --git
a/app/assets/javascripts/views/resource_picture_pictures/summary.js.coffee
b/app/assets/javascripts/views/resource_picture_pictures/summary.js.coffee
index
b560dbe
..
f60e13b
100644
(file)
--- a/
app/assets/javascripts/views/resource_picture_pictures/summary.js.coffee
+++ b/
app/assets/javascripts/views/resource_picture_pictures/summary.js.coffee
@@
-2,7
+2,6
@@
class Pettanr.Views.ResourcePicturePicture.Summary extends Pettanr.View.Summary
\r
initialize: (options) ->
\r
super(options)
\r
- @item = options.item
\r
@load()
\r
\r
load: () ->
\r
diff --git
a/db/migrate/20140612222717_fix_extend_system_data.rb
b/db/migrate/20140612222717_fix_extend_system_data.rb
index
8582368
..
ee4e5cc
100644
(file)
--- a/
db/migrate/20140612222717_fix_extend_system_data.rb
+++ b/
db/migrate/20140612222717_fix_extend_system_data.rb
@@
-5,7
+5,6
@@
class FixExtendSystemData < ActiveRecord::Migration
if balloon.speech_balloon_template_module_name == 'noname'
balloon.speech_balloon_template_id = sbt.id
balloon.speech_balloon_template_module_name = sbt.module_name
- p balloon
balloon.boosts 'post'
end
balloon.save!
diff --git
a/lib/peta/leaf.rb
b/lib/peta/leaf.rb
index
f7a2b10
..
26cd8a6
100644
(file)
--- a/
lib/peta/leaf.rb
+++ b/
lib/peta/leaf.rb
@@
-181,9
+181,9
@@
module Peta
res = false
self.class.transaction do
# renumber t
- self.class.
update_all('t = t - 1',
+ self.class.
where(
[self.binder_key + ' = ? and (t > ?)', self.binder_id, self.t]
- )
+ )
.update_all('t = t - 1')
res = super
raise ActiveRecord::Rollback unless res
end