pettanr_public_domain_v01_licenses 0.0.9 → 0.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/app/controllers/pettanr_public_domain_v01_licenses/attributes_controller.rb +4 -4
- data/app/models/pettanr_public_domain_v01_licenses/attribute.rb +5 -5
- data/app/views/pettanr_public_domain_v01_licenses/attributes/_form.html.erb +1 -1
- data/db/pettanr_public_domain_v01_license.json +1 -1
- data/db/pettanr_public_domain_v01_license.yml +4 -4
- data/lib/pettanr_public_domain_v01_licenses/version.rb +1 -1
- metadata +2 -2
|
@@ -8,9 +8,9 @@ module PettanrPublicDomainV01Licenses
|
|
|
8
8
|
|
|
9
9
|
def new
|
|
10
10
|
@original_picture, @original_picture_license_group, @license_group =
|
|
11
|
-
PettanrPublicDomainV01Licenses::Attribute.remember_params params, @
|
|
11
|
+
PettanrPublicDomainV01Licenses::Attribute.remember_params params, @operators
|
|
12
12
|
@public_domain_license = PettanrPublicDomainV01Licenses::Attribute.new
|
|
13
|
-
@public_domain_license.supply_default @
|
|
13
|
+
@public_domain_license.supply_default @operators
|
|
14
14
|
|
|
15
15
|
respond_to do |format|
|
|
16
16
|
format.html # new.html.erb
|
|
@@ -20,9 +20,9 @@ module PettanrPublicDomainV01Licenses
|
|
|
20
20
|
|
|
21
21
|
def create
|
|
22
22
|
@original_picture, @original_picture_license_group, @license_group =
|
|
23
|
-
PettanrPublicDomainV01Licenses::Attribute.remember_params params, @
|
|
23
|
+
PettanrPublicDomainV01Licenses::Attribute.remember_params params, @operators
|
|
24
24
|
@public_domain_license = PettanrPublicDomainV01Licenses::Attribute.new params[:public_domain_license]
|
|
25
|
-
@license = License.show @public_domain_license.license_id
|
|
25
|
+
@license = License.show @public_domain_license.license_id, @operators
|
|
26
26
|
@resource_picture = @original_picture.resource_picture || ResourcePicture.new
|
|
27
27
|
@resource_picture.attributes = @public_domain_license.resource_picture_attributes @original_picture
|
|
28
28
|
@resource_picture.overwrite @original_picture
|
|
@@ -5,8 +5,8 @@ module PettanrPublicDomainV01Licenses
|
|
|
5
5
|
validates :license_id, :presence => true, :numericality => true, :existence => true
|
|
6
6
|
validates :artist_name, :presence => true
|
|
7
7
|
|
|
8
|
-
def supply_default
|
|
9
|
-
self.artist_name =
|
|
8
|
+
def supply_default operators
|
|
9
|
+
self.artist_name = operators.artist.name
|
|
10
10
|
end
|
|
11
11
|
|
|
12
12
|
def resource_picture_attributes op
|
|
@@ -17,10 +17,10 @@ module PettanrPublicDomainV01Licenses
|
|
|
17
17
|
}
|
|
18
18
|
end
|
|
19
19
|
|
|
20
|
-
def self.remember_params params,
|
|
21
|
-
op = OriginalPicture.show params[:original_picture_id],
|
|
20
|
+
def self.remember_params params, operators
|
|
21
|
+
op = OriginalPicture.show params[:original_picture_id], operators
|
|
22
22
|
oplg = OriginalPictureLicenseGroup.new(params[:original_picture_license_group])
|
|
23
|
-
lg = LicenseGroup.show oplg.license_group_id
|
|
23
|
+
lg = LicenseGroup.show oplg.license_group_id, operators
|
|
24
24
|
[op, oplg, lg]
|
|
25
25
|
end
|
|
26
26
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<%
|
|
2
2
|
unless @public_domain_license
|
|
3
3
|
@public_domain_license = PettanrPublicDomainV01Licenses::Attribute.new
|
|
4
|
-
@public_domain_license.supply_default @
|
|
4
|
+
@public_domain_license.supply_default @operators
|
|
5
5
|
end
|
|
6
6
|
%>
|
|
7
7
|
<%= form_tag('/pettanr_public_domain_v01_licenses/attributes') do %>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"
|
|
1
|
+
{"PublicDomainV01Licenses@pettanr":{"classname":"PettanrPublicDomainV01Licenses","caption":"Public Domain 0.1","url":"https://github.com/yasushiito/pettanr_pd_v01_licenses/wiki","licenses_attributes":{"PublicDomainV01Licenses:PD@pettanr":{"caption":"Public Domain","url":"https://github.com/yasushiito/pettanr_pd_v01_licenses/wiki/PublicDomain","credit_pictures":{"source_url_btn_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAIAAAC0D9CtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA1SURBVDhPY3j/ZAOpiIFUDUD1OPV0MIjiMm5UD55wwxMHoHADBisagmvAKjUap1ROo3jiBwCmiapYhZeQ8QAAAABJRU5ErkJggg=="},"source_url_off_btn_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAYAAAA7bUf6AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAABISURBVDhPY3z//v1/BgoBE4X6wdoJGnKqO4OgPQQNIWgCMS4ZgYYwUiOdgA3BFY1mpTPg4YpPDVVcQjCdjCY2YhI5phqqxA4An6wclAZTJpkAAAAASUVORK5CYII="}},"settings":"{\"open\":0,\"commercial\":1,\"official\":0,\"attribution\":0,\"derive\":1,\"thumbnail\":1,\"gif_convert\":1,\"reverse\":1,\"resize\":1,\"sync_vh\":1,\"overlap\":1,\"trackback\":0}","system_picture_id":{"text":"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"}},"PublicDomainV01Licenses:CL@pettanr":{"caption":"Copyleft","url":"https://github.com/yasushiito/pettanr_pd_v01_licenses/wiki/Copyleft","credit_pictures":{"source_url_btn_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAIAAAC0D9CtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA1SURBVDhPY3j/ZAOpiIFUDUD1OPV0MIjiMm5UD55wwxMHoHADBisagmvAKjUap1ROo3jiBwCmiapYhZeQ8QAAAABJRU5ErkJggg=="},"source_url_off_btn_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAYAAAA7bUf6AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAABISURBVDhPY3z//v1/BgoBE4X6wdoJGnKqO4OgPQQNIWgCMS4ZgYYwUiOdgA3BFY1mpTPg4YpPDVVcQjCdjCY2YhI5phqqxA4An6wclAZTJpkAAAAASUVORK5CYII="}},"settings":"{\"open\":0,\"commercial\":1,\"official\":0,\"attribution\":0,\"derive\":1,\"thumbnail\":1,\"gif_convert\":1,\"reverse\":1,\"resize\":1,\"sync_vh\":1,\"overlap\":1,\"trackback\":0}","system_picture_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAYAAABjyArgAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAleSURBVHja7FoJVFTnFf6YeTPsKLKLIhKNCgwIuKG4pYqpS9VoiFqNuCfaqvEkbdos5xipNi61bokbjdSqRJFUjUbRiCJKBEQBFaIGUJEgKBp2Zu29PzCBuMUjzmlO5j/nnTfz3vvf8t3vfnd5z8LH3eXFEeMnfKZS+QfIZDINzOOZh16vV2RnX8w6GBc7zWL+H+cnqQJU/XkHAWxGp2UAFuvsrOxTkm+3bv78RyFJZmRaaMiJqBqtFoytpFAqAAsLMyotPFgNZIStzGAwmNF4ToOx/dm6IJNLkMvlRHYL42SdTgu9TmdG8jHjiQBLSktCU4/iokLcvHEd9+7dI/rL4eLiDC9vH7RxdhUg67TmBOSpAGYNkSuUyEhNwaGEBFzN+Rban8iJlbU1grurMGrkKHTw6Qx1bY0Z0Z8DsIykwECpRvTmT5F4IgkMa2efDgjtEYT27dqRNOhx5do1JKeew5mUVKSeTcekiREYNvx30GrUMOv6YwBmjWV4NmxYi9S0DHh4uGLl35ZgYuQso/42jqrKCixf8iGWrVqLf++IRW1tHcaMf83M5McBrCDNjft8pwC3ywsd8XXicXi290ZlRQXiY7cjPS0VVpZWCBs4CCNficDij1dj0EtDMeqV8Yjb+wW8vLwQ1KM3NOo6M7qsBj/NFIoKb+DAoa9gZ2uD+Ph4Ae7B+N1Q+XfD1NnzsG5LDFas34Qxr05EWK9g0uZLGDxsONYsXyqYH7dvn5CJpmzXUhDUaDTGpSUlhBN6Xh41jNemY/R0Xb2J5asZwJJCgZMnEumGtJgT+Xv4BnRHcuIxjJs4BQU3bkGpkBCk6ga/FzuJiSnnMjFi5AiUl9/HjHkL0Y8AL8grQNaFcyJANj4g63lBwXVQfY4ffigX23UN5eSz5pnldL6K8vKHGo1LVo1aLa5bUlIKNrmMJdCEIMuaiK9gXnZurtCNqTNmi81//tM7qKObbNfWHSe/TkBG1mVc/PYqNqxZAQUFw6t51xH1/rvi2Ijx4+pr8IuXjOXifUrrln34Hs6cSsKNgnx8supjHDl8WOwXAGh1qBPM1hrZxb8F82g+7+Pj+L+2Sc7deEzKmdO0nBFzm56L9/G86I2fIP+7a6ioKMfnu3YJqWNGmxxgtiwHrdK7ZXD3dEdXvwCxfdGiRdi2aT2+3L8fffoPNk6cM/9tRIwZIX4fPX5SrPuEDYCc1kXFxYI5Ehlgy7o1GD1hMqZERuK3I0di4V8+QEZKMqqrq6Fh0MiohTcLyQvKBcOYXVVVVdATWNW0Lim+Lc5dV1srFmY+m6GWAqmODKAgr5MkSeTiBlr4XJWVlSLNvEPPUlZyGz6dOkFJseVK9gXk5ReIgqklPOjpghwBXFtTA3V1DexdnSnY1bs4y8OjRmBgAHbs3Y/Kqmrx38XVDdzbqKFsQkOFRxU9KAe7Ll27iAdSkmxIkgJ/XRwFHQGZn5ePndGbEDp4CHKzs9DJ1w/h4eHYE7sLNcQ4VUhP5FzMpDjQAW4eHsg+n4FZb84VzFy9dAnmLHwbllZWQoLYKOuWL0MfOldCbg58VYEi3RQedeECrG1sxO/0s9/Ap2NHWFpbCS8ynUTQA3PhoLSxRgWzS12fz25Z9w+s+OgDpJxKfGByZmaWWNvb2Yp16W1mrgbWVpawoJuvq1OjsVPHjOK4J6OlmplIuTSDGzl3Pvr274835i9AWlIibt0qEgEyqHcoQvv1xcw5byKTih0bAqis9Dads06wnc/n7OwkWMzecPTIEYQNeRlDh4Zj0uuROHnkILp27QorG1sMHzUKo8eOFffy2qRJZBRLk3UPjVdhDbO1s4eLUxsUUqDKvZQFVVAPRG+LwdmMLLh/uhlf7I41ysSmtSux+78Hxe8hgweI9TenT4FVsq27O+T0ANbELuHeBIqcMhSDJBcycP/efTJAfZbhTNeTy7jHIYOrZ3t8/30R1HW1cKNzMFOV5EkMpr2DA/yDe4pgWVZ2F31fChf7eWGdZzmpIQ88QUGaGR3Sb4DQ4gb3bJbnm7J72IzBErmwiqzOtxUTvVlsXrlyFeW9ShQXl2Dgb8IRHOAL/y6dMW/BO0JDucJ7P+rv4tjdcXvFWuXvR49kQQazhbuXN04kJpJWSkIrr1y9hq3rVkNLzLMmdpWW3hHyodfrUHLrJtq29SSGWaMgP0/oKwcuBtGpjRN69OyFA3tikXwsAUFBQYIUOrqHVq1bCwN4k+uHkTfwEkj7nZwcjUWPwZhZmDZNa+YnWoquAwcNxuGjx7Dxs/9g2qw3EEaaFrdzO/7w1iKRqp3PzjFyIjQkEDHbd8DBoTWiN/wTp1Mz4O3jjYDuIRRwOJLrMXX6DGzftg1R770rWM0uPWH6bLi7uWHc5KmI2bge3fv0w9VL2Rg4bAQ8PdsKQC9nnoea5OYKabBfSC+6hj1sbW1FcHNo5UigtjICzPoa1n8AafBSlN29ixuUNbzQzRfDhr0s2MzGa5SpmK2bMWX6TICk0BQyYbF1y5Yy0kvHRsFXUpXGlVz8vgOikjt2/Djaef1YyWWcSxduGzagvpLjm048ckhUcjUUIBe9taBZJccMlOQyoZOc7jnY2wsX5Xms8WzUEmJxKwLQjvfRthVRizF24mRKDT1RQYGSO3ecsvE9Rm/aiIDgEGJzT5Gl1NbUivNJ5CEMZklpqdDr1sRqHpwj29nZCUaoKSbcIQOwhIGbWc8xyIlsR6+/94AJGZjR415FYdEtUS736tPb2It4fdZcWh7ei9AQWyPGjUVwr9BmvQgF6a7QUktLYRgBRkN0598GYpGbq2t9D4TAZeD1dC4yAQwEiqOjowiIvC05KQm3qdIMiJxm1FOJshaWVIk0nnNfVxdXo8Ry6slg8wYGkyXQjTKd5w3uYxnctJsWs+1fT+ymlZTehURzW6KbxvMYtGvf5cGDWMbRno3BwKkpUKanpUEVGEhsb0UY/X+/5mpk8EMBNvaDKWfNSD+LrxIScOVyrkn6wQbhRWphZCPTG25YvD0hA/wSXtA+UiKa1vF6kgvW0yBK+J/0RqOlWpTMS2VDkdN0yE3o1iZ9ZaRtCFau7p7w8PR64J2chnJW83gGgI2MFi84tWbEnrbQsDB/E/H8MghOR7l3oDdRZ+nXNOp70RpIl3NyLvK3aZzIm79NazlweTC20pd7ds2kgCW+rqQUyfxxQwsMw49fV878nwADAB50s2JVxyC5AAAAAElFTkSuQmCC"}}}}}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
classname:
|
|
1
|
+
PublicDomainV01Licenses@pettanr:
|
|
2
|
+
classname: PettanrPublicDomainV01Licenses
|
|
3
3
|
caption: Public Domain 0.1
|
|
4
4
|
url: https://github.com/yasushiito/pettanr_pd_v01_licenses/wiki
|
|
5
5
|
licenses_attributes:
|
|
6
|
-
|
|
6
|
+
PublicDomainV01Licenses:PD@pettanr:
|
|
7
7
|
caption: Public Domain
|
|
8
8
|
url: https://github.com/yasushiito/pettanr_pd_v01_licenses/wiki/PublicDomain
|
|
9
9
|
system_picture_file: ./PublicDomain.png
|
|
@@ -23,7 +23,7 @@ PublicDomainV01License@pettanr:
|
|
|
23
23
|
sync_vh: 1
|
|
24
24
|
overlap: 1
|
|
25
25
|
trackback: 0
|
|
26
|
-
|
|
26
|
+
PublicDomainV01Licenses:CL@pettanr:
|
|
27
27
|
caption: Copyleft
|
|
28
28
|
url: https://github.com/yasushiito/pettanr_pd_v01_licenses/wiki/Copyleft
|
|
29
29
|
system_picture_file: ./Copyleft.png
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: pettanr_public_domain_v01_licenses
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0
|
|
4
|
+
version: 0.1.0
|
|
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: 2013-
|
|
12
|
+
date: 2013-12-18 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails
|