jinda 0.7.0.3 → 0.7.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -4
- data/app/controllers/concerns/jinda_run_concern.rb +6 -3
- data/app/views/jinda/index.html.haml +1 -1
- data/lib/generators/jinda/config_generator.rb +1 -3
- data/lib/generators/jinda/install_generator.rb +161 -132
- data/lib/generators/jinda/templates/app/controllers/comments_controller.rb +31 -0
- data/lib/generators/jinda/templates/app/models/comment.rb +2 -1
- data/lib/generators/jinda/templates/app/views/articles/_report.haml +0 -5
- data/lib/generators/jinda/templates/app/views/articles/show.html.haml +39 -34
- data/lib/generators/jinda/templates/app/views/identities/new.html.haml +32 -0
- data/lib/generators/jinda/templates/app/views/password_resets/new.html.haml +11 -0
- data/lib/generators/jinda/templates/app/views/sessions/new.html.haml +22 -0
- data/lib/jinda/themes.rb +159 -154
- data/lib/jinda/version.rb +1 -1
- metadata +7 -31
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9b21591045ed229eafd7d773521a1516cd1de8206ab5a333bb2451d229746bed
|
|
4
|
+
data.tar.gz: 8da9450b53735e56974598365f0c5d6084c496c19fc1f24a72ee84a374597276
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 53661d2defbed1497a8c3245e4ea97e54edd3cb79d037c9bc9a856450b532c9d70de7f13cdd8205094020f2355fb9e9d0a0b9b753333aeaebdddb9e45df50de7
|
|
7
|
+
data.tar.gz: 231a576aae9bd37846c9082b214636cc05cb1bf63b44cd7245472e4201b1ffebec2bc83dfc3969084004adbdc44517215b308ee60a9e02ce8636e7dfd3b35720
|
data/README.md
CHANGED
|
@@ -15,7 +15,7 @@ Rails Application Generator using Freemind
|
|
|
15
15
|
These versions works for sure but others may do.
|
|
16
16
|
|
|
17
17
|
* Ruby 2.7.1
|
|
18
|
-
* Rails 6.0
|
|
18
|
+
* Rails 6.1.0
|
|
19
19
|
* MongoDB 6
|
|
20
20
|
* Freemind 1.0.1
|
|
21
21
|
|
|
@@ -40,7 +40,7 @@ app without ActiveRecord
|
|
|
40
40
|
|
|
41
41
|
## Add jinda to your Gemfile:
|
|
42
42
|
|
|
43
|
-
gem 'jinda'
|
|
43
|
+
gem 'jinda'
|
|
44
44
|
|
|
45
45
|
For Development (most updated)
|
|
46
46
|
|
|
@@ -62,8 +62,6 @@ Then run bundle again to install additional gems added by jinda
|
|
|
62
62
|
|
|
63
63
|
$ bundle
|
|
64
64
|
|
|
65
|
-
(or run all with "sh install.sh" )
|
|
66
|
-
|
|
67
65
|
configure mongoid, omniauth
|
|
68
66
|
|
|
69
67
|
$ rails generate jinda:config
|
|
@@ -18,9 +18,12 @@ module JindaRunConcern
|
|
|
18
18
|
# Check if help file available for this form
|
|
19
19
|
###############################################################################################
|
|
20
20
|
@help = File.read(fhelp) if File.exists?(fhelp)
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
f1= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
|
|
22
|
+
f2= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.haml"
|
|
23
|
+
if File.file?(f1)
|
|
24
|
+
@ui= File.read(f1)
|
|
25
|
+
elsif File.file?(f2)
|
|
26
|
+
@ui= File.read(f2)
|
|
24
27
|
else
|
|
25
28
|
# flash[:notice]= "Error: Can not find the view file for this controller"
|
|
26
29
|
ma_log "Error: Can not find the view file for this controller"
|
|
@@ -8,7 +8,7 @@ module Jinda
|
|
|
8
8
|
def backup_files
|
|
9
9
|
st=" "
|
|
10
10
|
# inside("config/initializers") {(File.file? "omniauth.rb") ? (FileUtils.mv "omniauth.rb", "omniauth.rb.bak") : (puts "new omniauth.rb created")}
|
|
11
|
-
|
|
11
|
+
inside("config") {(File.file? "mongoid.yml") ? (FileUtils.mv "mongoid.yml", "mongoid.yml.bak") : (puts "new mongoid.yml will be created")}
|
|
12
12
|
(File.file? ".env") ? (FileUtils.mv ".env", ".env-bak") : (puts "backup .env")
|
|
13
13
|
end
|
|
14
14
|
desc "gen_image_store"
|
|
@@ -43,14 +43,12 @@ module Jinda
|
|
|
43
43
|
end
|
|
44
44
|
end
|
|
45
45
|
|
|
46
|
-
|
|
47
46
|
desc "Set up mongoid config"
|
|
48
47
|
def setup_mongoid
|
|
49
48
|
generate "mongoid:config"
|
|
50
49
|
inject_into_file 'config/mongoid.yml', :after => ' # raise_not_found_error: true' do
|
|
51
50
|
"\n raise_not_found_error: false"
|
|
52
51
|
end
|
|
53
|
-
|
|
54
52
|
inject_into_file 'config/mongoid.yml', :after => ' # belongs_to_required_by_default: true' do
|
|
55
53
|
"\n belongs_to_required_by_default: false"
|
|
56
54
|
end
|
|
@@ -7,66 +7,142 @@ module Jinda
|
|
|
7
7
|
end
|
|
8
8
|
|
|
9
9
|
def setup_gems
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
10
|
+
# # define required gems: jinda_gem, jinda_dev_gem
|
|
11
|
+
jinda_gem =
|
|
12
|
+
[
|
|
13
|
+
["bson", "4.4.2"],
|
|
14
|
+
["maruku", "~> 0.7.3"],
|
|
15
|
+
["bcrypt"],
|
|
16
|
+
["rouge"],
|
|
17
|
+
["normalize-rails"],
|
|
18
|
+
["font-awesome-rails"],
|
|
19
|
+
["font-awesome-sass", "~> 5.12.0"],
|
|
20
|
+
["meta-tags"],
|
|
21
|
+
["jquery-turbolinks", "2.1.0"],
|
|
22
|
+
["mongo", "2.11.3"],
|
|
23
|
+
["turbolinks_render"],
|
|
24
|
+
["haml-rails", "~> 2.0.1"],
|
|
25
|
+
["haml", "~> 5.1", ">= 5.1.2"],
|
|
26
|
+
["mail"],
|
|
27
|
+
["prawn"],
|
|
28
|
+
["redcarpet"],
|
|
29
|
+
["oauth2", "1.4.4"],
|
|
30
|
+
["omniauth", "1.9.1"],
|
|
31
|
+
["omniauth-oauth2", "1.6.0"],
|
|
32
|
+
["omniauth-identity", "~> 1.1.1"],
|
|
33
|
+
["omniauth-facebook", "6.0.0"],
|
|
34
|
+
["omniauth-google-oauth2", "0.8.0"],
|
|
35
|
+
["dotenv-rails"],
|
|
36
|
+
["cloudinary", "1.13.2"],
|
|
37
|
+
["kaminari", "1.2.0"],
|
|
38
|
+
["jquery-rails", "4.3.5"]
|
|
39
|
+
]
|
|
40
|
+
#
|
|
41
|
+
jinda_custom =
|
|
42
|
+
[
|
|
43
|
+
["mongoid-paperclip", require: "mongoid_paperclip"],
|
|
44
|
+
["kaminari-mongoid", "1.0.1"],
|
|
45
|
+
["nokogiri", "~> 1.11.0"],
|
|
46
|
+
["mongoid", git: "git@github.com:kul1/mongoid-jinda.git"]
|
|
47
|
+
# ["mongoid", "~> 7.1.0"]
|
|
48
|
+
]
|
|
49
|
+
#
|
|
50
|
+
jinda_dev_gem =
|
|
51
|
+
[
|
|
52
|
+
["shoulda"],
|
|
53
|
+
["rspec"],
|
|
54
|
+
["rspec-rails"],
|
|
55
|
+
["better_errors"],
|
|
56
|
+
["binding_of_caller"],
|
|
57
|
+
["pry-byebug"],
|
|
58
|
+
["factory_bot_rails"],
|
|
59
|
+
["database_cleaner"],
|
|
60
|
+
["guard"],
|
|
61
|
+
["guard-rspec"],
|
|
62
|
+
["guard-minitest"],
|
|
63
|
+
["capybara"],
|
|
64
|
+
["selenium-webdriver"],
|
|
65
|
+
["rb-fsevent"],
|
|
66
|
+
["valid_attribute"],
|
|
67
|
+
["faker"]
|
|
68
|
+
]
|
|
69
|
+
|
|
70
|
+
# Check each jinda_gem and create new array if found one otherwise just create.
|
|
71
|
+
# Open Gemfile add gem if not exist
|
|
72
|
+
jinda_gem.each do |g|
|
|
73
|
+
unless (%x(gem list -e --no-versions #{g[0]})) == "#{g[0]}\n"
|
|
74
|
+
if g.count == 2
|
|
75
|
+
gem g[0], g[1]
|
|
76
|
+
else
|
|
77
|
+
gem g[0]
|
|
78
|
+
end
|
|
79
|
+
else
|
|
80
|
+
if g.count == 2
|
|
81
|
+
xgem_0 = %x(gem list -e #{g[0]})
|
|
82
|
+
unless xgem_0.include?(("#{g[1]}").gsub(/[~> ]/, ''))
|
|
83
|
+
say " Found existing #{xgem_0} in Gemfile or System, Please edit Gemfile", :red
|
|
84
|
+
gem g[0], g[1]
|
|
85
|
+
else
|
|
86
|
+
say " Checking #{g[0]} found Ver. #{g[1]} already exist in Gemfile", :green
|
|
87
|
+
end
|
|
88
|
+
end
|
|
89
|
+
say " SKIP adding #{g[0]} in Gemfile", :yellow
|
|
90
|
+
end
|
|
91
|
+
end
|
|
92
|
+
|
|
93
|
+
# create list of gem in sub-group dev and test
|
|
94
|
+
jinda_dev_new = Array.new
|
|
95
|
+
jinda_dev_gem.each do |g|
|
|
96
|
+
unless (%x(gem list -e --no-versions #{g[0]})) == "#{g[0]}\n"
|
|
97
|
+
jinda_dev_new << g
|
|
98
|
+
else
|
|
99
|
+
say " #{g[0]} already exist in Gemfile", :yellow
|
|
100
|
+
end
|
|
57
101
|
end
|
|
102
|
+
unless jinda_dev_new.count == 0
|
|
103
|
+
gem_group :development, :test do
|
|
104
|
+
jinda_dev_new.each do |n|
|
|
105
|
+
if n.count == 1
|
|
106
|
+
gem n[0]
|
|
107
|
+
else
|
|
108
|
+
gem n[0], n[1]
|
|
109
|
+
end
|
|
110
|
+
end
|
|
111
|
+
end
|
|
112
|
+
end
|
|
113
|
+
|
|
114
|
+
# create list of custom gem
|
|
115
|
+
jinda_custom_new = Array.new
|
|
116
|
+
jinda_custom.each do |g|
|
|
117
|
+
# unless (%x(gem list -e --no-versions #{g[0]})) == "#{g[0]}\n"
|
|
118
|
+
unless File.read("Gemfile").include?("#{g[0]}, #{g[1]}")
|
|
119
|
+
jinda_custom_new << g
|
|
120
|
+
else
|
|
121
|
+
say " #{g[0]} already exist in Gemfile", :yellow
|
|
122
|
+
end
|
|
123
|
+
end
|
|
124
|
+
unless jinda_custom_new.count == 0
|
|
125
|
+
jinda_custom_new.each do |c|
|
|
126
|
+
say " Checking if #{c[0]} already exist in Gemfile", :yellow
|
|
127
|
+
if c.count == 1
|
|
128
|
+
gem c[0]
|
|
129
|
+
else
|
|
130
|
+
gem c[0], c[1]
|
|
131
|
+
end
|
|
132
|
+
end
|
|
133
|
+
end
|
|
58
134
|
end
|
|
59
135
|
|
|
60
136
|
def setup_app
|
|
61
137
|
# inside("public") { run "FileUtils.mv index.html index.html.bak" }
|
|
62
|
-
|
|
138
|
+
inside("db") {(File.file? "seeds.rb") ? (FileUtils.mv "seeds.rb", "seeds.rb.bak") : ( say "no seeds.rb", :green)}
|
|
63
139
|
inside("app/views/layouts") {(File.file? "application.html.erb") ? (FileUtils.mv 'application.html.erb', 'application.html.erb.bak') : ( say "no app/views/layout/ application.html.erb", :blue )}
|
|
64
140
|
inside("app/controllers") {(File.file? "application_controller.rb") ? (FileUtils.mv 'application_controller.rb', 'application_controller.rb.bak' ) : ( say "no app/controller/application_controller.rb, :blue ")}
|
|
65
141
|
inside("app/helpers") {(File.file? "application_helper.rb") ? (FileUtils.mv 'application_helper.rb', 'application_helper.rb.bak') : ( say "no app/helpers/application_helper.rb", :blue)}
|
|
66
142
|
inside("app/assets/javascripts") {(File.file? 'application.js') ? (FileUtils.mv 'application.js', 'application.js.bak') : ( say "no application.js", :blue)}
|
|
67
143
|
inside("app/assets/stylesheets") {(File.file? "application.css") ? (FileUtils.mv 'application.css', 'application.css.bak') : ( say "no application.css", :blue)}
|
|
68
144
|
inside("config/initializers") {(File.file? "omniauth.rb") ? (FileUtils.mv 'omniauth.rb', 'omniauth.rb.bak') : (say "no omniauth.rb", :blue)}
|
|
69
|
-
|
|
145
|
+
inside("config/initializers") {(File.file? "mongoid.rb") ? (FileUtils.mv 'mongoid.rb', 'mongoid.rb.bak') : (say "no mongoid.rb")}
|
|
70
146
|
inside("app/assets/config") {(File.file? "manifest.js") ? (FileUtils.mv "manifest.js", "manifest.js-rails") : (puts "backup to manifest.js-rails")}
|
|
71
147
|
directory "app"
|
|
72
148
|
directory "spec"
|
|
@@ -79,79 +155,32 @@ module Jinda
|
|
|
79
155
|
# inside("app/assets/javascripts") {(File.file? "application.js") ? ( say "Please include application-org.js in application.js", :red) : (FileUtils.mv 'application-org.js', 'application.js')}
|
|
80
156
|
# inside("app/assets/stylesheets") {(File.file? "application.css") ? ( say "Please include application-org.css in application.css", :red) : (FileUtils.mv 'application-org.css', 'application.css')}
|
|
81
157
|
# inside("app/assets/stylesheets") {(File.file? "application.css.scss") ? ( say "Please include application-org.css.scss in application.css.scss", :red) : (FileUtils.mv 'application-org.css.scss', 'application.css.scss')}
|
|
82
|
-
inside("app/controllers") {(File.file? "admins_controller.rb") ? ( say "Please merge existing jinda_org/admins_controller.rb after this installation", :
|
|
83
|
-
inside("app/controllers") {(File.file? "articles_controller.rb") ? ( say "Please merge existing jinda_org/articles_controller.rb after this installation", :
|
|
84
|
-
inside("app/controllers") {(File.file? "comments_controller.rb") ? ( say "Please merge existing jinda_org/comments_controller.rb after this installation", :
|
|
85
|
-
inside("app/controllers") {(File.file? "docs_controller.rb") ? ( say "Please merge existing jinda_org/docs_controller.rb after this installation", :
|
|
86
|
-
inside("app/controllers") {(File.file? "identities_controller.rb") ? ( say "Please merge existing jinda_org/identities_controller.rb after this installation", :
|
|
87
|
-
inside("app/controllers") {(File.file? "application_controller.rb") ? ( say "Pleas merge existing jinda_org/application_controller.rb after this installation", :
|
|
158
|
+
inside("app/controllers") {(File.file? "admins_controller.rb") ? ( say " Please merge existing jinda_org/admins_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/admins_controller.rb', 'admins_controller.rb')}
|
|
159
|
+
inside("app/controllers") {(File.file? "articles_controller.rb") ? ( say " Please merge existing jinda_org/articles_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/articles_controller.rb', 'articles_controller.rb')}
|
|
160
|
+
inside("app/controllers") {(File.file? "comments_controller.rb") ? ( say " Please merge existing jinda_org/comments_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/comments_controller.rb', 'comments_controller.rb')}
|
|
161
|
+
inside("app/controllers") {(File.file? "docs_controller.rb") ? ( say " Please merge existing jinda_org/docs_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/docs_controller.rb', 'docs_controller.rb')}
|
|
162
|
+
inside("app/controllers") {(File.file? "identities_controller.rb") ? ( say " Please merge existing jinda_org/identities_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/identities_controller.rb', 'identities_controller.rb')}
|
|
163
|
+
inside("app/controllers") {(File.file? "application_controller.rb") ? ( say " Pleas merge existing jinda_org/application_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/application_controller.rb', 'application_controller.rb')}
|
|
88
164
|
## Moved to Engine
|
|
89
|
-
# inside("app/controllers") {(File.file? "jinda_controller.rb") ? ( say "Please merge existing jinda_org/jinda_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/jinda_controller.rb', 'jinda_controller.rb')}
|
|
90
|
-
inside("app/controllers") {(File.file? "password_resets_controller.rb") ? ( say "Please merge existing jinda_org/password_resets_controller.rb after this installation", :
|
|
91
|
-
inside("app/controllers") {(File.file? "password_resets.rb") ? ( say "Please merge existing jinda_org/password_resets.rb after this installation", :
|
|
92
|
-
inside("app/controllers") {(File.file? "sessions_controller.rb") ? ( say "Please merge existing jinda_org/sessions_controller.rb after this installation", :
|
|
93
|
-
inside("app/controllers") {(File.file? "users_controller.rb") ? ( say "Please merge existing jinda_org/users_controller.rb after this installation", :
|
|
94
|
-
inside("app/controllers") {(File.file? "sitemap_controller.rb") ? ( say "Please merge existing jinda_org/sitemap_controller.rb after this installation", :
|
|
95
|
-
inside("app/controllers") {(File.file? "notes_controller.rb") ? ( say "Please merge existing jinda_org/notes_controller.rb after this installation", :
|
|
165
|
+
# inside("app/controllers") {(File.file? "jinda_controller.rb") ? ( say " Please merge existing jinda_org/jinda_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/jinda_controller.rb', 'jinda_controller.rb')}
|
|
166
|
+
inside("app/controllers") {(File.file? "password_resets_controller.rb") ? ( say " Please merge existing jinda_org/password_resets_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/password_resets_controller.rb', 'password_resets_controller.rb')}
|
|
167
|
+
inside("app/controllers") {(File.file? "password_resets.rb") ? ( say " Please merge existing jinda_org/password_resets.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/password_resets.rb', 'password_resets.rb')}
|
|
168
|
+
inside("app/controllers") {(File.file? "sessions_controller.rb") ? ( say " Please merge existing jinda_org/sessions_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/sessions_controller.rb', 'sessions_controller.rb')}
|
|
169
|
+
inside("app/controllers") {(File.file? "users_controller.rb") ? ( say " Please merge existing jinda_org/users_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/users_controller.rb', 'users_controller.rb')}
|
|
170
|
+
inside("app/controllers") {(File.file? "sitemap_controller.rb") ? ( say " Please merge existing jinda_org/sitemap_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/sitemap_controller.rb', 'sitemap_controller.rb')}
|
|
171
|
+
inside("app/controllers") {(File.file? "notes_controller.rb") ? ( say " Please merge existing jinda_org/notes_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/notes_controller.rb', 'notes_controller.rb')}
|
|
96
172
|
end
|
|
97
173
|
# routes created each line as reversed order in routes
|
|
98
174
|
# Moved routes to Engine
|
|
99
175
|
def setup_routes
|
|
100
|
-
# route "end"
|
|
101
|
-
# route " end"
|
|
102
|
-
# route " namespace :v1 do resources :notes, :only => [:index] end"
|
|
103
|
-
# route " namespace :api do"
|
|
104
|
-
# route "post '/api/v1/notes' => 'api/v1/notes#create', as: 'api_v1_notes'"
|
|
105
|
-
# route "get '/api/v1/notes/my' => 'api/v1/notes#my'"
|
|
106
|
-
# route "\# api"
|
|
107
176
|
route "root :to => 'jinda#index'"
|
|
108
|
-
|
|
109
|
-
# route "resources :password_resets"
|
|
110
|
-
# route "resources :sessions"
|
|
111
|
-
# route "resources :identities"
|
|
112
|
-
# route "resources :users"
|
|
113
|
-
# route "resources :docs"
|
|
114
|
-
# route "resources :notes"
|
|
115
|
-
# route "resources :comments"
|
|
116
|
-
# route "resources :articles do resources :comments end"
|
|
117
|
-
# route "get '/jinda/document/:id' => 'jinda#document'"
|
|
118
|
-
# route "get '/notes/destroy/:id' => 'notes#destroy'"
|
|
119
|
-
# route "get '/notes/my/destroy/:id' => 'notes#destroy'"
|
|
120
|
-
# route "get '/docs/my/destroy' => 'docs#destroy'"
|
|
121
|
-
# route "get '/notes/my' => 'notes/my'"
|
|
122
|
-
# route "get '/docs/my' => 'docs/my'"
|
|
123
|
-
# route "get '/articles/edit' => 'articles/edit'"
|
|
124
|
-
# route "get '/articles/show' => 'articles/show'"
|
|
125
|
-
# route "get '/articles/my/destroy' => 'articles#destroy'"
|
|
126
|
-
# route "get '/articles/my' => 'articles#my'"
|
|
127
|
-
# route "get '/logout' => 'sessions#destroy', :as => 'logout'"
|
|
128
|
-
# route "get '/auth/failure' => 'sessions#destroy'"
|
|
129
|
-
# route "get '/auth/:provider/callback' => 'sessions#create'"
|
|
130
|
-
# route "post '/auth/:provider/callback' => 'sessions#create'"
|
|
131
|
-
# route "\# end jinda method routes"
|
|
132
|
-
# route "post '/jinda/end_output' => 'jinda#end_output'"
|
|
133
|
-
# route "post '/jinda/end_form' => 'jinda#end_form'"
|
|
134
|
-
# route "post '/jinda/pending' => 'jinda#index'"
|
|
135
|
-
# route "post '/jinda/init' => 'jinda#init'"
|
|
136
|
-
# route "jinda_methods.each do \|aktion\| get \"/jinda/\#\{aktion\}\" => \"jinda#\#\{aktion\}\" end"
|
|
137
|
-
# route "jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']"
|
|
138
|
-
# route "jinda_methods += ['run_redirect', 'run_direct_to','run_if']"
|
|
139
|
-
# route "jinda_methods += ['init', 'run', 'run_mail', 'document', 'run_do', 'run_form', 'end_form']"
|
|
140
|
-
# route "jinda_methods = ['pending', 'status', 'search', 'doc', 'doc_print', 'logs', 'ajax_notice']"
|
|
141
|
-
# route "\# start jiinda method routes"
|
|
142
|
-
end
|
|
177
|
+
end
|
|
143
178
|
|
|
144
179
|
def setup_env
|
|
145
180
|
FileUtils.mv "README.md", "README.md.bak"
|
|
146
181
|
create_file 'README.md', ''
|
|
147
|
-
# FileUtils.mv 'install.sh', 'install.sh'
|
|
148
|
-
# inject_into_file 'config/application.rb', :after => 'require "active_resource/railtie"' do
|
|
149
|
-
# inject_into_file 'config/application.rb', :after => 'require "rails"' do
|
|
150
|
-
# "\nrequire 'rexml/document'\n"+
|
|
151
|
-
# "\nrequire 'mongoid/railtie'\n"
|
|
152
|
-
# end
|
|
153
182
|
application do
|
|
154
|
-
%q{
|
|
183
|
+
%q{
|
|
155
184
|
# Jinda default
|
|
156
185
|
config.generators do |g|
|
|
157
186
|
g.orm :mongoid
|
|
@@ -174,10 +203,10 @@ module Jinda
|
|
|
174
203
|
# :enable_starttls_auto => true }
|
|
175
204
|
# config.action_mailer.raise_delivery_errors = true
|
|
176
205
|
# config.action_mailer.perform_deliveries = true
|
|
177
|
-
}
|
|
206
|
+
}
|
|
178
207
|
end
|
|
179
208
|
initializer "jinda.rb" do
|
|
180
|
-
%q{# encoding: utf-8
|
|
209
|
+
%q{# encoding: utf-8
|
|
181
210
|
MM = "#{Rails.root}/app/jinda/index.mm"
|
|
182
211
|
DEFAULT_TITLE = 'Jinda'
|
|
183
212
|
DEFAULT_HEADER = 'Jinda'
|
|
@@ -190,25 +219,26 @@ NEXT = "Next >"
|
|
|
190
219
|
IMAGE_LOCATION = "upload"
|
|
191
220
|
# for debugging
|
|
192
221
|
# DONT_SEND_MAIL = true
|
|
193
|
-
}
|
|
194
|
-
end
|
|
195
|
-
|
|
196
|
-
initializer "mongoid.rb" do
|
|
197
|
-
%q{# encoding: utf-8
|
|
198
|
-
#
|
|
199
|
-
# Mongoid 6 follows the new pattern of AR5 requiring a belongs_to relation to always require its parent
|
|
200
|
-
# belongs_to` will now trigger a validation error by default if the association is not present.
|
|
201
|
-
# You can turn this off on a per-association basis with `optional: true`.
|
|
202
|
-
# (Note this new default only applies to new Rails apps that will be generated with
|
|
203
|
-
# `config.active_record.belongs_to_required_by_default = true` in initializer.)
|
|
204
|
-
#
|
|
205
|
-
Mongoid::Config.belongs_to_required_by_default = false
|
|
206
|
-
}
|
|
222
|
+
}
|
|
207
223
|
end
|
|
224
|
+
# Move mongoid.rb to jinda:config
|
|
225
|
+
# To avoid repeate install jinda:install crash
|
|
226
|
+
initializer "mongoid.rb" do
|
|
227
|
+
%q{# encoding: utf-8
|
|
228
|
+
#
|
|
229
|
+
# Mongoid 6 follows the new pattern of AR5 requiring a belongs_to relation to always require its parent
|
|
230
|
+
# belongs_to` will now trigger a validation error by default if the association is not present.
|
|
231
|
+
# You can turn this off on a per-association basis with `optional: true`.
|
|
232
|
+
# (Note this new default only applies to new Rails apps that will be generated with
|
|
233
|
+
# `config.active_record.belongs_to_required_by_default = true` in initializer.)
|
|
234
|
+
#
|
|
235
|
+
Mongoid::Config.belongs_to_required_by_default = false
|
|
236
|
+
}
|
|
237
|
+
end
|
|
208
238
|
|
|
209
239
|
inject_into_file 'config/environment.rb', :after => "initialize!" do
|
|
210
240
|
"\n\n# hack to fix cloudinary error https://github.com/archiloque/rest-client/issues/141" +
|
|
211
|
-
|
|
241
|
+
"\nclass Hash\n remove_method :read\nrescue\nend"
|
|
212
242
|
end
|
|
213
243
|
inject_into_file 'config/environments/development.rb', :after => 'config.action_mailer.raise_delivery_errors = false' do
|
|
214
244
|
"\n config.action_mailer.default_url_options = { :host => 'localhost:3000' }"
|
|
@@ -218,16 +248,15 @@ Mongoid::Config.belongs_to_required_by_default = false
|
|
|
218
248
|
"\n config.assets.compile = true"
|
|
219
249
|
end
|
|
220
250
|
inject_into_file 'config/initializers/assets.rb', :after => '# Precompile additional assets.
|
|
221
|
-
' do
|
|
222
|
-
"Rails.application.config.assets.precompile += %w( sarabun.css )" +
|
|
223
|
-
"\nRails.application.config.assets.precompile += %w( disable_enter_key.js )\n"
|
|
251
|
+
' do
|
|
252
|
+
"Rails.application.config.assets.precompile += %w( sarabun.css )" +
|
|
253
|
+
"\nRails.application.config.assets.precompile += %w( disable_enter_key.js )\n"
|
|
224
254
|
end
|
|
225
255
|
end
|
|
226
256
|
|
|
227
257
|
def finish
|
|
228
258
|
say "\n"
|
|
229
259
|
say "Jinda gem ready for next configuration install.\n"
|
|
230
|
-
say " (or short cut with sh install.sh)\n"
|
|
231
260
|
say "Normally you will use the following command:\n"
|
|
232
261
|
say "----------------------------------------\n"
|
|
233
262
|
say "bundle install\n"
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
class CommentsController < ApplicationController
|
|
2
|
+
before_action :comment_params, only: [:create]
|
|
3
|
+
before_action :load_commmentable
|
|
4
|
+
|
|
5
|
+
def index
|
|
6
|
+
@comments = @commentable.comments
|
|
7
|
+
end
|
|
8
|
+
|
|
9
|
+
def create
|
|
10
|
+
@comment = @commentable.comments.new comment_params
|
|
11
|
+
@comment.save!
|
|
12
|
+
redirect_to [@commentable], notice: "Comment created"
|
|
13
|
+
end
|
|
14
|
+
|
|
15
|
+
private
|
|
16
|
+
|
|
17
|
+
# def article_params
|
|
18
|
+
# params.require(:comment).permit(:article_id)
|
|
19
|
+
# end
|
|
20
|
+
|
|
21
|
+
def comment_params
|
|
22
|
+
resource = request.path.split('/')[1]
|
|
23
|
+
commentable_id = "#{resource.singularize.to_sym}_id" #:article_id
|
|
24
|
+
params.require(:comment).permit(:body, :user_id,:name, :image, commentable_id.to_sym)
|
|
25
|
+
end
|
|
26
|
+
|
|
27
|
+
def load_commmentable
|
|
28
|
+
resource, id = request.path.split('/')[1,2]
|
|
29
|
+
@commentable = resource.singularize.classify.constantize.find(id)
|
|
30
|
+
end
|
|
31
|
+
end
|
|
@@ -4,9 +4,10 @@ class Comment
|
|
|
4
4
|
# jinda begin
|
|
5
5
|
include Mongoid::Timestamps
|
|
6
6
|
field :body, :type => String
|
|
7
|
+
field :name, :type => String
|
|
8
|
+
field :image, :type => String
|
|
7
9
|
belongs_to :article, :class_name => "Article"
|
|
8
10
|
belongs_to :user, :class_name => "User"
|
|
9
|
-
belongs_to :job, :class_name => "Job"
|
|
10
11
|
belongs_to :commentable, polymorphic: true
|
|
11
12
|
index({ commentable_id: 1, commentable_type: 1})
|
|
12
13
|
# jinda end
|
|
@@ -4,39 +4,44 @@
|
|
|
4
4
|
.container
|
|
5
5
|
%div.row::before
|
|
6
6
|
%div.col-md-12
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
%
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
%
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
7
|
+
.row-description
|
|
8
|
+
%h2.display-3.mt-5.pt-5
|
|
9
|
+
= @article.title
|
|
10
|
+
= link_to image_tag('pencil.png', style:'border:none; float:right;', id: 'article_pen'), {controller: "articles", action: "edit", article_id: @article.id}, data: { confirm: "Please Confirm" }
|
|
11
|
+
%hr
|
|
12
|
+
= @article.text
|
|
13
|
+
%h4.row-body
|
|
14
|
+
= @article.body.html_safe
|
|
15
|
+
%hr
|
|
16
|
+
- @comments.each do |comment|
|
|
17
|
+
%div#article-comment.ui-corner-all
|
|
18
|
+
.col-md-12
|
|
19
|
+
%div.small-box.bg-white.text-info
|
|
20
|
+
%div.inner
|
|
21
|
+
%div.font-weight-light
|
|
22
|
+
Author:
|
|
23
|
+
%b= comment.name if comment.name
|
|
24
|
+
%div.right-date
|
|
25
|
+
12/12/2021
|
|
26
|
+
%div#comment-body
|
|
27
|
+
%i= comment.body
|
|
28
28
|
|
|
29
29
|
- if login?
|
|
30
|
-
%
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
.
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
30
|
+
%hr
|
|
31
|
+
%h4.col-md-12
|
|
32
|
+
Add a comment:
|
|
33
|
+
= form_with(model: [@article, Comment.new], local: true) do |f|
|
|
34
|
+
.form-group
|
|
35
|
+
= f.hidden_field :article_id, :value => @article.id
|
|
36
|
+
.form-group
|
|
37
|
+
= f.label :body, "Comment"
|
|
38
|
+
.form-group
|
|
39
|
+
= f.text_area :body, rows: 5, class: "form-control"
|
|
40
|
+
.form-group
|
|
41
|
+
= f.hidden_field :user_id, :value => current_ma_user.id
|
|
42
|
+
.form-group
|
|
43
|
+
= f.hidden_field :name, :value => current_ma_user.code
|
|
44
|
+
.form-group
|
|
45
|
+
= f.hidden_field :image, :value => current_ma_user.image
|
|
46
|
+
.form-group
|
|
47
|
+
= f.submit "Submit", class: "btn btn-default btn-success"
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
.container
|
|
2
|
+
.signup-form
|
|
3
|
+
- @title= 'Sign Up'
|
|
4
|
+
= form_tag "/auth/identity/register", {'data-ajax'=>'false'} do
|
|
5
|
+
%h1.h3.mb-3.font-weight-normal{:style => "text-align: center"} Sign Up
|
|
6
|
+
.sign_in
|
|
7
|
+
.label-warning
|
|
8
|
+
= flash[:alert]
|
|
9
|
+
- if @identity && @identity.errors.any?
|
|
10
|
+
.error_messages
|
|
11
|
+
%h3
|
|
12
|
+
= pluralize(@identity.errors.count, "error")
|
|
13
|
+
prohibited this account from being saved:
|
|
14
|
+
%ul
|
|
15
|
+
- @identity.errors.full_messages.each do |msg|
|
|
16
|
+
%li= msg
|
|
17
|
+
.form-group.form-control
|
|
18
|
+
= label_tag :code, 'Username'
|
|
19
|
+
= text_field_tag :code, @identity.try(:code)
|
|
20
|
+
.form-group.form-control
|
|
21
|
+
= label_tag :email
|
|
22
|
+
= text_field_tag :email, @identity.try(:email)
|
|
23
|
+
.form-group.form-control
|
|
24
|
+
= label_tag :password, 'Password'
|
|
25
|
+
= password_field_tag :password
|
|
26
|
+
.form-group.form-control
|
|
27
|
+
= label_tag :password_confirmation, 'Confirm password'
|
|
28
|
+
= password_field_tag :password_confirmation
|
|
29
|
+
%button.btn.btn-success.btn-block.actions{:type => "submit"}
|
|
30
|
+
%i.fas.fa-sign-up-alt
|
|
31
|
+
Sign Up
|
|
32
|
+
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
.container
|
|
2
|
+
.signup-form
|
|
3
|
+
.sign_in
|
|
4
|
+
= form_tag password_resets_path, :method => :post do
|
|
5
|
+
.form-group.form-control
|
|
6
|
+
= label_tag :email
|
|
7
|
+
= text_field_tag :email, params[:email]
|
|
8
|
+
%button.btn.btn-success.btn-block.actions{:type => "submit"}
|
|
9
|
+
%i.fas.fa-sign-in-alt
|
|
10
|
+
Reset Password
|
|
11
|
+
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
.container
|
|
2
|
+
.signup-form
|
|
3
|
+
= form_tag "/auth/identity/callback", {'data-ajax'=>'false'} do
|
|
4
|
+
%h1.h3.mb-3.font-weight-normal{:style => "text-align: center"} Sign in
|
|
5
|
+
.sign_in
|
|
6
|
+
.label-warning
|
|
7
|
+
= flash[:alert]
|
|
8
|
+
.form-group.form-control
|
|
9
|
+
= label_tag :auth_key, "User name"
|
|
10
|
+
= text_field_tag :auth_key
|
|
11
|
+
.form-group.form-control
|
|
12
|
+
= label_tag :password, "Password"
|
|
13
|
+
= password_field_tag :password
|
|
14
|
+
.form-group
|
|
15
|
+
= label_tag :remember_me
|
|
16
|
+
= check_box_tag :remember_me, 1, params.permit[:remember_me]
|
|
17
|
+
%button.btn.btn-success.btn-block.actions{:type => "submit"}
|
|
18
|
+
%i.fas.fa-sign-in-alt
|
|
19
|
+
Sign in
|
|
20
|
+
= link_to 'Forgotten password?', new_password_reset_path, data: {icon: 'info', mini: 'true', role: 'button'}
|
|
21
|
+
%hr/
|
|
22
|
+
|
data/lib/jinda/themes.rb
CHANGED
|
@@ -1,163 +1,168 @@
|
|
|
1
1
|
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
2
|
+
# ############################### Themes ###################################
|
|
3
|
+
#
|
|
4
|
+
# Check login user information from User model: name(code), image for Themes
|
|
5
|
+
#
|
|
6
|
+
# ##########################################################################
|
|
7
|
+
def get_login_user_info
|
|
8
|
+
if current_ma_user.present?
|
|
9
|
+
$user_image = current_ma_user.image
|
|
10
|
+
$user_name = current_ma_user.code
|
|
11
|
+
$user_email = current_ma_user.email
|
|
12
|
+
$user_id = current_ma_user.try(:id)
|
|
13
|
+
else
|
|
14
|
+
$user_image = asset_url("user.png", :width => "48")
|
|
15
|
+
$user_name = 'Guest User'
|
|
16
|
+
$user_email = 'guest@sample.com'
|
|
17
|
+
$user_id = ''
|
|
18
|
+
end
|
|
19
|
+
return $user_image, $user_name, $user_email,$user_id
|
|
20
|
+
end
|
|
21
21
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
22
|
+
def name2code(s)
|
|
23
|
+
# rather not ignore # symbol cause it could be comment
|
|
24
|
+
code, name = s.split(':')
|
|
25
|
+
code.downcase.strip.gsub(' ','_').gsub(/[^#_\/a-zA-Z0-9]/,'')
|
|
26
|
+
end
|
|
27
|
+
def name2camel(s)
|
|
28
|
+
s.gsub(' ','_').camelcase
|
|
29
|
+
end
|
|
30
|
+
def true_action?(s)
|
|
31
|
+
%w(call ws redirect invoke email).include? s
|
|
32
|
+
end
|
|
33
|
+
def set_global
|
|
34
|
+
$xmain= @xmain ; $runseq = @runseq ; $user = current_ma_user ; $xvars= @xmain.xvars; $ip = request.env["REMOTE_ADDR"]
|
|
35
|
+
end
|
|
36
|
+
def authorize? # use in pending tasks
|
|
37
|
+
@runseq= @xmain.runseqs.find @xmain.current_runseq
|
|
38
|
+
return false unless @runseq
|
|
39
|
+
@user = current_ma_user
|
|
40
|
+
set_global
|
|
41
|
+
return false unless eval(@runseq.rule) if @runseq.rule
|
|
42
|
+
return true if true_action?(@runseq.action)
|
|
43
|
+
# return false if check_wait
|
|
44
|
+
return true if @runseq.role.blank?
|
|
45
|
+
unless @runseq.role.empty?
|
|
46
|
+
return false unless @user.role
|
|
47
|
+
return @user.role.upcase.split(',').include?(@runseq.role.upcase)
|
|
48
|
+
end
|
|
49
|
+
return true
|
|
50
|
+
end
|
|
51
|
+
def authorize_init? # use when initialize new transaction
|
|
52
|
+
# check module role
|
|
53
|
+
mrole = @service.module.role
|
|
54
|
+
return false if mrole && !current_ma_user
|
|
55
|
+
return false if mrole && !current_ma_user.has_role(mrole)
|
|
56
56
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
57
|
+
# check step 1 role
|
|
58
|
+
xml= @service.xml
|
|
59
|
+
step1 = REXML::Document.new(xml).root.elements['node']
|
|
60
|
+
role= get_option_xml("role", step1) || ""
|
|
61
|
+
# rule= get_option_xml("rule", step1) || true
|
|
62
|
+
rule= get_option_xml("rule", step1) || true
|
|
63
|
+
return true if role==""
|
|
64
|
+
unless current_ma_user
|
|
65
|
+
return role.blank?
|
|
66
|
+
else
|
|
67
|
+
return false unless current_ma_user.role
|
|
68
|
+
return current_ma_user.has_role(role)
|
|
69
|
+
end
|
|
70
70
|
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
71
|
+
end
|
|
72
|
+
def ma_log(message)
|
|
73
|
+
# Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
|
|
74
|
+
# :unread=> true, :ip=> ($ip || request.env["REMOTE_ADDR"])
|
|
75
|
+
if session[:user_id]
|
|
76
|
+
Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
|
|
77
|
+
:user_id => $user.id, :unread=> true, :ip=>request.env["REMOTE_ADDR"]
|
|
78
|
+
else
|
|
79
|
+
Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
|
|
80
|
+
:unread=> true, :ip=>request.env["REMOTE_ADDR"]
|
|
81
|
+
end
|
|
82
|
+
end
|
|
83
83
|
|
|
84
|
-
|
|
84
|
+
alias :ma_notice :ma_log
|
|
85
85
|
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
86
|
+
# methods from application_helper
|
|
87
|
+
def markdown(text)
|
|
88
|
+
begin
|
|
89
|
+
erbified = ERB.new(text.html_safe).result(binding)
|
|
90
|
+
rescue => error
|
|
91
|
+
flash[:notice] = "This ruby version not support #{error}"
|
|
92
|
+
return
|
|
93
|
+
end
|
|
94
|
+
red = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
|
|
95
|
+
red.render(erbified).html_safe
|
|
96
|
+
end
|
|
97
|
+
def align_text(s, pixel=3)
|
|
98
|
+
"<span style='position:relative; top:-#{pixel}px;'>#{s}</span>".html_safe
|
|
99
|
+
end
|
|
100
|
+
def status_icon(status)
|
|
101
|
+
case status
|
|
102
|
+
when 'R'
|
|
103
|
+
image_tag 'user.png'
|
|
104
|
+
when 'F'
|
|
105
|
+
image_tag 'tick.png'
|
|
106
|
+
when 'I'
|
|
107
|
+
image_tag 'control_play.png'
|
|
108
|
+
when 'E'
|
|
109
|
+
image_tag 'logout.png'
|
|
110
|
+
when 'X'
|
|
111
|
+
image_tag 'cross.png'
|
|
112
|
+
else
|
|
113
|
+
image_tag 'cancel.png'
|
|
114
|
+
end
|
|
115
|
+
end
|
|
116
|
+
def role_name(code)
|
|
117
|
+
role= Jinda::Role.where(code:code).first
|
|
118
|
+
return role ? role.name : ""
|
|
119
|
+
end
|
|
120
|
+
def uncomment(s)
|
|
121
|
+
s.sub(/^#\s/,'')
|
|
122
|
+
end
|
|
123
|
+
def code_div(s)
|
|
124
|
+
"<pre style='background-color: #efffef;'><code class='ruby' lang='ruby'> #{s}</code></pre>".html_safe
|
|
125
|
+
end
|
|
126
|
+
def ajax?(s)
|
|
127
|
+
return s.match('file_field') ? false : true
|
|
128
|
+
end
|
|
129
|
+
def step(s, total) # square text
|
|
130
|
+
s = (s==0)? 1: s.to_i
|
|
131
|
+
total = total.to_i
|
|
132
|
+
out ="<div class='step'>"
|
|
133
|
+
(s-1).times {|ss| out += "<span class='steps_done'>#{(ss+1)}</span>" }
|
|
134
|
+
out += %Q@<span class='step_now' >@
|
|
135
|
+
out += s.to_s
|
|
136
|
+
out += "</span>"
|
|
137
|
+
out += %Q@@
|
|
138
|
+
for i in s+1..total
|
|
139
|
+
out += "<span class='steps_more'>#{i}</span>"
|
|
140
|
+
end
|
|
141
|
+
out += "</div>"
|
|
142
|
+
out.html_safe
|
|
143
|
+
end
|
|
139
144
|
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
145
|
+
def current_ma_user
|
|
146
|
+
# if session[:user_id]
|
|
147
|
+
# return @user ||= User.find(session[:user_id]['$oid'])
|
|
148
|
+
# else
|
|
149
|
+
# return nil
|
|
150
|
+
# end
|
|
151
|
+
#@user ||= User.find_by_auth_token!(cookies[:auth_token]) if cookies[:auth_token]
|
|
152
|
+
@user ||= User.where(:auth_token => cookies[:auth_token]).first if cookies[:auth_token]
|
|
153
|
+
return @user
|
|
154
|
+
end
|
|
150
155
|
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
156
|
+
def ui_action?(s)
|
|
157
|
+
%w(form output mail pdf).include? s
|
|
158
|
+
end
|
|
159
|
+
# def handle_ma_notice
|
|
160
|
+
# if Jinda::Notice.recent.count>0
|
|
161
|
+
# notice= Jinda::Notice.recent.last
|
|
162
|
+
# notice.update_attribute :unread, false
|
|
163
|
+
# "<script>notice('#{notice.message}');</script>"
|
|
164
|
+
# else
|
|
165
|
+
# ""
|
|
166
|
+
# end
|
|
167
|
+
# end
|
|
163
168
|
|
data/lib/jinda/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: jinda
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.7.0
|
|
4
|
+
version: 0.7.5.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Prateep Kul
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: exe
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2021-
|
|
12
|
+
date: 2021-02-04 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rake
|
|
@@ -45,34 +45,6 @@ dependencies:
|
|
|
45
45
|
- - ">="
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
47
|
version: 4.1.11
|
|
48
|
-
- !ruby/object:Gem::Dependency
|
|
49
|
-
name: mongoid
|
|
50
|
-
requirement: !ruby/object:Gem::Requirement
|
|
51
|
-
requirements:
|
|
52
|
-
- - "~>"
|
|
53
|
-
- !ruby/object:Gem::Version
|
|
54
|
-
version: 7.1.0
|
|
55
|
-
type: :development
|
|
56
|
-
prerelease: false
|
|
57
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
58
|
-
requirements:
|
|
59
|
-
- - "~>"
|
|
60
|
-
- !ruby/object:Gem::Version
|
|
61
|
-
version: 7.1.0
|
|
62
|
-
- !ruby/object:Gem::Dependency
|
|
63
|
-
name: rails
|
|
64
|
-
requirement: !ruby/object:Gem::Requirement
|
|
65
|
-
requirements:
|
|
66
|
-
- - "<"
|
|
67
|
-
- !ruby/object:Gem::Version
|
|
68
|
-
version: '6.1'
|
|
69
|
-
type: :runtime
|
|
70
|
-
prerelease: false
|
|
71
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
72
|
-
requirements:
|
|
73
|
-
- - "<"
|
|
74
|
-
- !ruby/object:Gem::Version
|
|
75
|
-
version: '6.1'
|
|
76
48
|
description: 'Generate Rails workflow from mind map: Freemind'
|
|
77
49
|
email:
|
|
78
50
|
- 1.0@kul.asia
|
|
@@ -236,6 +208,7 @@ files:
|
|
|
236
208
|
- lib/generators/jinda/templates/app/channels/application_cable/channel.rb
|
|
237
209
|
- lib/generators/jinda/templates/app/channels/application_cable/connection.rb
|
|
238
210
|
- lib/generators/jinda/templates/app/controllers/api/v1/notes_controller.rb
|
|
211
|
+
- lib/generators/jinda/templates/app/controllers/comments_controller.rb
|
|
239
212
|
- lib/generators/jinda/templates/app/controllers/jinda_org/admins_controller.rb
|
|
240
213
|
- lib/generators/jinda/templates/app/controllers/jinda_org/application_controller.rb
|
|
241
214
|
- lib/generators/jinda/templates/app/controllers/jinda_org/articles_controller.rb
|
|
@@ -306,6 +279,7 @@ files:
|
|
|
306
279
|
- lib/generators/jinda/templates/app/views/docs/edit/select_note.html.erb
|
|
307
280
|
- lib/generators/jinda/templates/app/views/docs/index.haml
|
|
308
281
|
- lib/generators/jinda/templates/app/views/docs/my.haml
|
|
282
|
+
- lib/generators/jinda/templates/app/views/identities/new.html.haml
|
|
309
283
|
- lib/generators/jinda/templates/app/views/jinda_mailer/gmail.html.erb
|
|
310
284
|
- lib/generators/jinda/templates/app/views/layouts/_head.html.erb
|
|
311
285
|
- lib/generators/jinda/templates/app/views/layouts/_meta_tag.html.erb
|
|
@@ -343,6 +317,8 @@ files:
|
|
|
343
317
|
- lib/generators/jinda/templates/app/views/notes/show.haml
|
|
344
318
|
- lib/generators/jinda/templates/app/views/notes/xedit/edit_note.html.erb
|
|
345
319
|
- lib/generators/jinda/templates/app/views/password_resets/edit.html.erb
|
|
320
|
+
- lib/generators/jinda/templates/app/views/password_resets/new.html.haml
|
|
321
|
+
- lib/generators/jinda/templates/app/views/sessions/new.html.haml
|
|
346
322
|
- lib/generators/jinda/templates/app/views/sitemap/index.xml.haml
|
|
347
323
|
- lib/generators/jinda/templates/app/views/user_mailer/password_reset.html.haml
|
|
348
324
|
- lib/generators/jinda/templates/app/views/user_mailer/password_reset.text.erb
|
|
@@ -476,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
476
452
|
- !ruby/object:Gem::Version
|
|
477
453
|
version: '0'
|
|
478
454
|
requirements: []
|
|
479
|
-
rubygems_version: 3.2
|
|
455
|
+
rubygems_version: 3.1.2
|
|
480
456
|
signing_key:
|
|
481
457
|
specification_version: 4
|
|
482
458
|
summary: 'Rails workflow from mind map: Freemind'
|