enju_resource_merge 0.0.9 → 0.0.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/lib/enju_resource_merge.rb
CHANGED
|
@@ -2,4 +2,27 @@ require "enju_resource_merge/engine"
|
|
|
2
2
|
require "will_paginate/array"
|
|
3
3
|
|
|
4
4
|
module EnjuResourceMerge
|
|
5
|
+
def self.included(base)
|
|
6
|
+
base.extend(ClassMethods)
|
|
7
|
+
end
|
|
8
|
+
|
|
9
|
+
module ClassMethods
|
|
10
|
+
def enju_resource_merge
|
|
11
|
+
include EnjuResourceMerge::InstanceMethods
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
|
|
15
|
+
module InstanceMethods
|
|
16
|
+
private
|
|
17
|
+
|
|
18
|
+
def get_patron_merge_list
|
|
19
|
+
@patron_merge_list = PatronMergeList.find(params[:patron_merge_list_id]) if params[:patron_merge_list_id]
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
def get_series_statement_merge_list
|
|
23
|
+
@series_statement_merge_list = SeriesStatementMergeList.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
|
|
24
|
+
end
|
|
25
|
+
end
|
|
5
26
|
end
|
|
27
|
+
|
|
28
|
+
ActionController::Base.send(:include, EnjuResourceMerge)
|
|
@@ -5,6 +5,8 @@ class ApplicationController < ActionController::Base
|
|
|
5
5
|
rescue_from ActiveRecord::RecordNotFound, :with => :render_404
|
|
6
6
|
|
|
7
7
|
before_filter :set_locale
|
|
8
|
+
|
|
9
|
+
enju_resource_merge
|
|
8
10
|
|
|
9
11
|
private
|
|
10
12
|
def render_403
|
|
@@ -65,14 +67,6 @@ class ApplicationController < ActionController::Base
|
|
|
65
67
|
@patron = Patron.find(params[:patron_id]) if params[:patron_id]
|
|
66
68
|
authorize! :show, @patron if @patron
|
|
67
69
|
end
|
|
68
|
-
|
|
69
|
-
def get_patron_merge_list
|
|
70
|
-
@patron_merge_list = PatronMergeList.find(params[:patron_merge_list_id]) if params[:patron_merge_list_id]
|
|
71
|
-
end
|
|
72
|
-
|
|
73
|
-
def get_series_statement_merge_list
|
|
74
|
-
@series_statement_merge_list = SeriesStatementMergeList.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
|
|
75
|
-
end
|
|
76
70
|
end
|
|
77
71
|
|
|
78
72
|
class InvalidLocaleError < StandardError
|
data/spec/dummy/db/test.sqlite3
CHANGED
|
Binary file
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: enju_resource_merge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.10
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-05-
|
|
12
|
+
date: 2012-05-30 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails
|