apidae 0.9.2 → 0.9.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/apidae/projects_controller.rb +22 -13
- data/app/models/apidae/obj.rb +1 -1
- data/app/models/apidae/overridden_fields.rb +1 -2
- data/app/models/apidae/selection.rb +1 -1
- data/app/views/apidae/projects/index.html.erb +3 -1
- data/config/initializers/constants.rb +3 -0
- data/lib/apidae/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f40e5ca95d358cc2e60b9f551ddd92f12a99fd13
|
4
|
+
data.tar.gz: 71294f4f216d6031357eefb74fa16471eff7aaf1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 07d9fffb31e67f35ffbe412baeb5e0d5e82d8eb20b161a40aef15000da34b1cdf4267c10813e12cbc1dd2cb5cc358731397cab5e0e122556c68fbef2b00c4bc6
|
7
|
+
data.tar.gz: 63044d89c16f89e0c14150f90c894d769e1489a771a169c1885853632effd2398569625f7fb8fb40788757239b8c6acb5a43642c812da9a55979d98812f5a8e3
|
@@ -14,13 +14,18 @@ module Apidae
|
|
14
14
|
end
|
15
15
|
|
16
16
|
def create
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été créé'
|
17
|
+
if Project.find_by_apidae_id(project_params[:apidae_id])
|
18
|
+
@project = Project.find_by_apidae_id(project_params[:apidae_id])
|
19
|
+
update_project
|
21
20
|
else
|
22
|
-
|
23
|
-
|
21
|
+
@project = Project.new(project_params)
|
22
|
+
if @project.save
|
23
|
+
referrer = session.delete(:referrer)
|
24
|
+
redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été créé'
|
25
|
+
else
|
26
|
+
flash.now[:alert] = "Une erreur s'est produite lors la création du projet"
|
27
|
+
render :new
|
28
|
+
end
|
24
29
|
end
|
25
30
|
end
|
26
31
|
|
@@ -29,13 +34,7 @@ module Apidae
|
|
29
34
|
end
|
30
35
|
|
31
36
|
def update
|
32
|
-
|
33
|
-
referrer = session.delete(:referrer)
|
34
|
-
redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été mis à jour'
|
35
|
-
else
|
36
|
-
flash.now[:alert] = "Une erreur s'est produite lors la mise à jour du projet"
|
37
|
-
render :edit
|
38
|
-
end
|
37
|
+
update_project
|
39
38
|
end
|
40
39
|
|
41
40
|
def destroy
|
@@ -49,6 +48,16 @@ module Apidae
|
|
49
48
|
@project = Project.find(params[:id])
|
50
49
|
end
|
51
50
|
|
51
|
+
def update_project
|
52
|
+
if @project.update(project_params)
|
53
|
+
referrer = session.delete(:referrer)
|
54
|
+
redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été mis à jour'
|
55
|
+
else
|
56
|
+
flash.now[:alert] = "Une erreur s'est produite lors la mise à jour du projet"
|
57
|
+
render :edit
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
52
61
|
def project_params
|
53
62
|
params.require(:project).permit(:name, :api_key, :apidae_id, locales: [], versions: [])
|
54
63
|
end
|
data/app/models/apidae/obj.rb
CHANGED
@@ -372,7 +372,7 @@ module Apidae
|
|
372
372
|
end
|
373
373
|
|
374
374
|
def main_picture
|
375
|
-
pictures.blank? ? "/#{Rails.application.config.apidae_pictures_path}/default/logo.png" : pictures[0]["url"]
|
375
|
+
pictures.blank? ? "/#{Rails.application.config.apidae_pictures_path}/default/logo.png" : pictures[0]["url"].gsub('http', 'https')
|
376
376
|
end
|
377
377
|
|
378
378
|
def self.build_rate(rate_period)
|
@@ -2,8 +2,7 @@ module Apidae
|
|
2
2
|
module OverriddenFields
|
3
3
|
|
4
4
|
# Note : add non-localized fields that can be overridden in aspects (openings, rates etc...)
|
5
|
-
|
6
|
-
:includes, :excludes, :extra, :booking_desc].each do |f|
|
5
|
+
LOCALIZED_FIELDS.each do |f|
|
7
6
|
define_method f do
|
8
7
|
if @obj_version == DEFAULT_VERSION
|
9
8
|
val = (super() || {})[@locale]
|
@@ -32,7 +32,7 @@ module Apidae
|
|
32
32
|
if obj
|
33
33
|
SelectionObject.create(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
|
34
34
|
else
|
35
|
-
logger.error "Object #{o} referenced in selection #{apidae_sel.apidae_id} and project #{
|
35
|
+
logger.error "Object #{o} referenced in selection #{apidae_sel.apidae_id} and project #{apidae_sel.apidae_project.apidae_id} is unknown"
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
@@ -12,6 +12,7 @@
|
|
12
12
|
<th>Nom</th>
|
13
13
|
<th>Identifiant</th>
|
14
14
|
<th>Locales</th>
|
15
|
+
<th>Versions</th>
|
15
16
|
<th>Mise à jour</th>
|
16
17
|
<th></th>
|
17
18
|
</tr>
|
@@ -22,13 +23,14 @@
|
|
22
23
|
<td><%= proj.name %></td>
|
23
24
|
<td><%= proj.apidae_id %></td>
|
24
25
|
<td><%= proj.locales.join(', ') %></td>
|
26
|
+
<td><%= proj.versions.join(', ') %></td>
|
25
27
|
<td><%= proj.updated_at.strftime('Le %d/%m/%Y à %H:%M') if proj.updated_at %></td>
|
26
28
|
<td><%= link_to 'Modifier', edit_project_path(proj) %></td>
|
27
29
|
</tr>
|
28
30
|
<% end %>
|
29
31
|
<% if @projects.empty? %>
|
30
32
|
<tr>
|
31
|
-
<td colspan="
|
33
|
+
<td colspan="6">Aucun projet pour le moment.</td>
|
32
34
|
</tr>
|
33
35
|
<% end %>
|
34
36
|
</tbody>
|
@@ -22,4 +22,7 @@ module Apidae
|
|
22
22
|
DEFAULT_VERSION = STANDARD_VERSION
|
23
23
|
ALL_VERSIONS = [STANDARD_VERSION, WINTER_VERSION, SUMMER_VERSION, CHALLENGED_VERSION, BUSINESS_VERSION,
|
24
24
|
GROUPS_VERSION, ACTIVITIES_VERSION]
|
25
|
+
|
26
|
+
LOCALIZED_FIELDS = [:title, :short_desc, :long_desc, :pictures, :attachments, :openings_desc, :rates_desc,
|
27
|
+
:includes, :excludes, :extra, :booking_desc]
|
25
28
|
end
|
data/lib/apidae/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: apidae
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jean-Baptiste Vilain
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-02-
|
11
|
+
date: 2019-02-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|