jinda 0.5.8 → 0.6.3

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.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/lib/generators/jinda/install_generator.rb +1 -1
  4. data/lib/generators/jinda/templates/app/controllers/jinda_org/articles_controller.rb +5 -3
  5. data/lib/generators/jinda/templates/app/controllers/jinda_org/comments_controller.rb +19 -7
  6. data/lib/generators/jinda/templates/app/jinda/index.mm +22 -26
  7. data/lib/generators/jinda/templates/app/jinda/template/index.mm +366 -0
  8. data/lib/generators/jinda/templates/app/models/comment.rb +5 -3
  9. data/lib/generators/jinda/templates/app/views/articles/show.html.haml +2 -1
  10. data/lib/generators/jinda/templates/app/views/jinda/_menu.haml +2 -1
  11. data/lib/generators/jinda/templates/app/views/jinda/index.html.haml +51 -41
  12. data/lib/jinda/helpers.rb +7 -2
  13. data/lib/jinda/version.rb +1 -1
  14. metadata +15 -28
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5437584419d20b8bf830bee5b254f52d79da72b0c7a63e4cff973a7c10156394
4
- data.tar.gz: ec3d5a1838787b031e5072fb682b39a592edec96efabf8d3760327a4f832fb27
3
+ metadata.gz: 661a8d702230640e288847dec26f01983875d8a03a94e88ad0a53c570b624a85
4
+ data.tar.gz: a4af8b0a7f8ab76a31d36a4e73bf1f1d1b9f8f5e3692f26e819b9511551015ff
5
5
  SHA512:
6
- metadata.gz: 332c30c673a0107c09994ba8c394751789a018d9957adac57839413d86f8dea0f306714f435afeb22d0c9a6e6b34e8278be6f1306c096824e422ef9605a8052c
7
- data.tar.gz: 110fb30d49712728b1988754995712612dd1c820c79f829c571fb89e02466fa37d7d300b72276355f2a47e8d0c537474bc24dbddefc5902be7a5002fb761943b
6
+ metadata.gz: 20b7ddc3eea7e120d04f50ef72bd2d1fe83195c30ae1346e5ac27f2dea0f72b958cbdfc02786b8ba217ec5597a50dcf669a287781f22650e0d648de88ce728cc
7
+ data.tar.gz: '07933562ed73d135260bbe3d1206d72238861e90277ec708164fbf2681ed59f31b092735536ff61c63e62c11f319cbb158a4f9c28564bf4da3b612c359565ff4'
data/README.md CHANGED
@@ -40,7 +40,7 @@ app without ActiveRecord
40
40
 
41
41
  ## Add jinda to your Gemfile:
42
42
 
43
- gem 'jinda', '~> 0.5.8'
43
+ gem 'jinda', '~> 0.6.2'
44
44
 
45
45
  For Development (most updated)
46
46
 
data/lib/generators/jinda/install_generator.rb CHANGED
@@ -19,7 +19,7 @@ module Jinda
19
19
  gem 'bson', '4.4.2'
20
20
  gem 'mongoid', '7.1.0.rc0'
21
21
  gem 'turbolinks_render'
22
- gem 'nokogiri', '1.10.9'
22
+ gem 'nokogiri', '1.10.10'
23
23
  gem 'haml', '~> 5.1', '>= 5.1.2'
24
24
  gem 'haml-rails', '~> 2.0.1'
25
25
  gem 'mail'
data/lib/generators/jinda/templates/app/controllers/jinda_org/articles_controller.rb CHANGED
@@ -12,8 +12,10 @@ class ArticlesController < ApplicationController
12
12
  end
13
13
 
14
14
  def show
15
- @article = Article.find(params[:article_id])
16
- @comments = @article.comments.desc(:created_at).page(params[:page]).per(10)
15
+ @article = Article.find(article_params)
16
+ @commentable = @article
17
+ @comments = @commentable.comments.desc(:created_at).page(params[:page]).per(10)
18
+
17
19
  prepare_meta_tags(title: @article.title,
18
20
  description: @article.text,
19
21
  keywords: @article.keywords)
@@ -92,7 +94,7 @@ class ArticlesController < ApplicationController
92
94
  end
93
95
 
94
96
  def article_params
95
- params[:article_id]
97
+ [params[:article_id], params[:id]].detect { |p| !p.nil? }
96
98
  end
97
99
 
98
100
  def load_edit_article
data/lib/generators/jinda/templates/app/controllers/jinda_org/comments_controller.rb CHANGED
@@ -1,19 +1,31 @@
1
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
2
8
 
3
9
  def create
4
- @article = Article.find(article_params["article_id"])
5
- @comment = @article.comments.new(comment_params)
10
+ @comment = @commentable.comments.new comment_params
6
11
  @comment.save!
7
- redirect_to controller: 'articles', action: 'show', article_id: @article
12
+ redirect_to [@commentable], notice: "Comment created"
8
13
  end
9
14
 
10
15
  private
11
16
 
12
- def article_params
13
- params.require(:comment).permit(:article_id)
14
- end
17
+ # def article_params
18
+ # params.require(:comment).permit(:article_id)
19
+ # end
15
20
 
16
21
  def comment_params
17
- params.require(:comment).permit(:body, :article_id, :user_id)
22
+ resource = request.path.split('/')[1]
23
+ commentable_id = "#{resource.singularize.to_sym}_id" #:article_id
24
+ params.require(:comment).permit(:body, :user_id, commentable_id.to_sym)
18
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
19
31
  end
data/lib/generators/jinda/templates/app/jinda/index.mm CHANGED
@@ -25,7 +25,7 @@
25
25
  </node>
26
26
  </node>
27
27
  </node>
28
- <node CREATED="1275752678377" ID="ID_1348489452" MODIFIED="1588883079396" TEXT="admins:Admin">
28
+ <node CREATED="1275752678377" FOLDED="true" ID="ID_1348489452" MODIFIED="1602251558474" TEXT="admins:Admin">
29
29
  <node CREATED="1275752688167" ID="ID_229996461" MODIFIED="1275752690948" TEXT="role:a"/>
30
30
  <node CREATED="1282722836614" ID="ID_1213363124" MODIFIED="1330477902602" TEXT="edit_role:edit user role">
31
31
  <node CREATED="1282722862918" ID="ID_1190117882" MODIFIED="1330477922159" TEXT="select_user:select user">
@@ -44,7 +44,7 @@
44
44
  <node CREATED="1275790679363" ID="ID_829325467" MODIFIED="1511159696044" TEXT="link: logs: /jinda/logs"/>
45
45
  <node CREATED="1507573166973" ID="ID_351025910" MODIFIED="1511159700908" TEXT="link: docs: /jinda/doc"/>
46
46
  </node>
47
- <node CREATED="1273706796854" ID="ID_1003882979" MODIFIED="1588964401951" TEXT="devs: Developer">
47
+ <node CREATED="1273706796854" FOLDED="true" ID="ID_1003882979" MODIFIED="1602251560242" TEXT="devs: Developer">
48
48
  <node CREATED="1275373154914" ID="ID_340725299" MODIFIED="1275373158632" TEXT="role:d"/>
49
49
  <node CREATED="1275788317299" ID="ID_716276608" MODIFIED="1511159716471" TEXT="link: error_logs: /jinda/error_logs"/>
50
50
  <node CREATED="1275788317299" ID="ID_1570419198" MODIFIED="1587858894833" TEXT="link: notice_logs: /jinda/notice_logs"/>
@@ -87,7 +87,7 @@
87
87
  </node>
88
88
  </node>
89
89
  </node>
90
- <node CREATED="1493393619430" ID="ID_554831343" MODIFIED="1592926786394" TEXT="notes: Notes">
90
+ <node CREATED="1493393619430" FOLDED="true" ID="ID_554831343" MODIFIED="1602251562724" TEXT="notes: Notes">
91
91
  <node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1589772615102" TEXT="link:My Notes: /notes/my">
92
92
  <node CREATED="1493490295677" ID="ID_514416082" MODIFIED="1493490302239" TEXT="role:m"/>
93
93
  </node>
@@ -151,22 +151,15 @@
151
151
  </node>
152
152
  </node>
153
153
  </node>
154
- <node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1592785024002" TEXT="articles: Article">
154
+ <node CREATED="1493393619430" FOLDED="true" ID="ID_328863650" MODIFIED="1602251538059" TEXT="articles: Article">
155
155
  <node CREATED="1493419096527" ID="ID_1521905276" MODIFIED="1493478060121" TEXT="link: All Articles: /articles"/>
156
156
  <node CREATED="1493489768542" FOLDED="true" ID="ID_1376361427" MODIFIED="1589757167952" TEXT="link: My article: /articles/my">
157
157
  <node CREATED="1493490295677" ID="ID_628476988" MODIFIED="1493490302239" TEXT="role:m"/>
158
158
  </node>
159
159
  <node CREATED="1493419257021" ID="ID_1355420049" MODIFIED="1588619429446" TEXT="new_article: New Article">
160
- <node CREATED="1592785043843" ID="ID_345287367" MODIFIED="1592799450248" TEXT="condition=1">
161
- <icon BUILTIN="help"/>
162
- <node CREATED="1592786104568" ID="ID_282788674" MODIFIED="1592802765385" TEXT="redirect: &quot;next&quot;"/>
163
- </node>
164
160
  <node CREATED="1493419299004" ID="ID_1468250197" MODIFIED="1493419428686" TEXT="form_article: New Article">
165
161
  <icon BUILTIN="attach"/>
166
162
  <node CREATED="1493479075294" ID="ID_1145618514" MODIFIED="1493479079687" TEXT="role:m"/>
167
- <node CREATED="1592785043843" ID="ID_962055360" MODIFIED="1592785146999" TEXT="match: &quot;end&quot;">
168
- <icon BUILTIN="help"/>
169
- </node>
170
163
  </node>
171
164
  <node CREATED="1493419491125" ID="ID_1687683396" MODIFIED="1493483244848" TEXT="create: Create Article">
172
165
  <icon BUILTIN="bookmark"/>
@@ -206,7 +199,7 @@
206
199
  </node>
207
200
  </node>
208
201
  </node>
209
- <node CREATED="1493664700564" ID="ID_704959130" MODIFIED="1592950100226" TEXT="comments: Comment">
202
+ <node CREATED="1493664700564" FOLDED="true" ID="ID_704959130" MODIFIED="1602251564023" TEXT="comments: Comment">
210
203
  <icon BUILTIN="button_cancel"/>
211
204
  <node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1591392666652" TEXT="new_comment: New Comment">
212
205
  <icon BUILTIN="button_cancel"/>
@@ -288,7 +281,7 @@
288
281
  <node CREATED="1273819855875" ID="ID_1429503284" MODIFIED="1330477311102" TEXT="a: admin"/>
289
282
  <node CREATED="1273819859775" ID="ID_568365839" MODIFIED="1330477315009" TEXT="d: developer"/>
290
283
  </node>
291
- <node CREATED="1273819456867" FOLDED="true" ID="ID_1677010054" MODIFIED="1591392810437" POSITION="left" TEXT="models">
284
+ <node CREATED="1273819456867" ID="ID_1677010054" MODIFIED="1602123498759" POSITION="left" TEXT="models">
292
285
  <node CREATED="1292122118499" FOLDED="true" ID="ID_1957754752" MODIFIED="1493705885123" TEXT="person">
293
286
  <node CREATED="1292122135809" ID="ID_1617970069" MODIFIED="1332878659106" TEXT="fname"/>
294
287
  <node CREATED="1292122150362" ID="ID_1200135538" MODIFIED="1332878662388" TEXT="lname"/>
@@ -312,7 +305,7 @@
312
305
  <node CREATED="1292243471343" ID="ID_1859608350" MODIFIED="1310195256623" TEXT="lat: float"/>
313
306
  <node CREATED="1292243477436" ID="ID_48497260" MODIFIED="1310195262534" TEXT="lng: float"/>
314
307
  </node>
315
- <node CREATED="1493418879485" FOLDED="true" ID="ID_1995497233" MODIFIED="1583097163789" TEXT="article">
308
+ <node CREATED="1493418879485" ID="ID_1995497233" MODIFIED="1602529325998" TEXT="article">
316
309
  <node CREATED="1493418891110" ID="ID_364756011" MODIFIED="1493418905253" TEXT="title"/>
317
310
  <node CREATED="1493418906868" ID="ID_1676483995" MODIFIED="1493418911919" TEXT="text"/>
318
311
  <node CREATED="1493487131376" ID="ID_1334057464" MODIFIED="1538328284823" TEXT="belongs_to :user, :class_name =&gt; &quot;User&quot;">
@@ -327,18 +320,6 @@
327
320
  <node CREATED="1494181636998" ID="ID_229502630" MODIFIED="1494181660419" TEXT="body"/>
328
321
  <node CREATED="1497913676275" ID="ID_404103076" MODIFIED="1497913685065" TEXT="keywords"/>
329
322
  </node>
330
- <node CREATED="1493418915637" FOLDED="true" ID="ID_429078131" MODIFIED="1583097162517" TEXT="comment">
331
- <node CREATED="1493418939760" ID="ID_1251093062" MODIFIED="1493418943423" TEXT="body"/>
332
- <node CREATED="1493418945686" ID="ID_911071644" MODIFIED="1493418986711" TEXT="belongs_to :article">
333
- <icon BUILTIN="edit"/>
334
- </node>
335
- <node CREATED="1493643129947" ID="ID_588013696" MODIFIED="1493643146424" TEXT="belongs_to :user">
336
- <icon BUILTIN="edit"/>
337
- </node>
338
- <node CREATED="1493718512191" ID="ID_173203253" MODIFIED="1493718583874" TEXT="validates :body, :user_id, :article_id, presence: true">
339
- <icon BUILTIN="edit"/>
340
- </node>
341
- </node>
342
323
  <node CREATED="1494040082403" FOLDED="true" ID="ID_864577403" MODIFIED="1583097161145" TEXT="picture">
343
324
  <node CREATED="1494040091583" ID="ID_679208099" MODIFIED="1494040119098" TEXT="picture"/>
344
325
  <node CREATED="1494040120208" ID="ID_1266154874" MODIFIED="1494040125130" TEXT="description"/>
@@ -368,6 +349,21 @@
368
349
  <icon BUILTIN="edit"/>
369
350
  </node>
370
351
  </node>
352
+ <node CREATED="1493418915637" ID="ID_429078131" MODIFIED="1602591443455" TEXT="comment">
353
+ <node CREATED="1493418939760" ID="ID_1251093062" MODIFIED="1493418943423" TEXT="body"/>
354
+ <node CREATED="1493418945686" ID="ID_911071644" MODIFIED="1602529513657" TEXT="belongs_to :article, :class_name =&gt; &quot;Article&quot; ">
355
+ <icon BUILTIN="edit"/>
356
+ </node>
357
+ <node CREATED="1493643129947" ID="ID_588013696" MODIFIED="1602110865206" TEXT="belongs_to :user, :class_name =&gt; &quot;User&quot; ">
358
+ <icon BUILTIN="edit"/>
359
+ </node>
360
+ <node CREATED="1601847760278" ID="ID_1288333428" MODIFIED="1602591549062" TEXT="belongs_to :commentable, polymorphic: true ">
361
+ <icon BUILTIN="edit"/>
362
+ </node>
363
+ <node CREATED="1602591560333" ID="ID_598892151" MODIFIED="1602592677709" TEXT="index({ commentable_id: 1, commentable_type: 1}) ">
364
+ <icon BUILTIN="edit"/>
365
+ </node>
366
+ </node>
371
367
  </node>
372
368
  </node>
373
369
  </map>
data/lib/generators/jinda/templates/app/jinda/template/index.mm ADDED
@@ -0,0 +1,366 @@
1
+ <map version="1.0.1">
2
+ <!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
3
+ <node CREATED="1273819432637" ID="ID_1098419600" MODIFIED="1334737006485" TEXT="Jinda">
4
+ <node CREATED="1273819462973" ID="ID_282419531" MODIFIED="1589756758387" POSITION="right" TEXT="services">
5
+ <node CREATED="1275756501221" FOLDED="true" ID="ID_1720745721" MODIFIED="1583097151076" TEXT="users:User">
6
+ <node CREATED="1278491598711" ID="ID_1662699954" MODIFIED="1494393920347" TEXT="role:m"/>
7
+ <node CREATED="1279700865182" ID="ID_1266797279" MODIFIED="1357798847781" TEXT="link:info: /users"/>
8
+ <node CREATED="1319015338880" ID="ID_189841353" MODIFIED="1528215866339" TEXT="link:pending tasks: /jinda/pending"/>
9
+ <node CREATED="1275905802131" ID="ID_154000410" MODIFIED="1355422418892" TEXT="user:edit">
10
+ <node CREATED="1275756515843" ID="ID_1108188320" MODIFIED="1330477833918" TEXT="enter_user:edit">
11
+ <icon BUILTIN="attach"/>
12
+ <node CREATED="1282816887988" ID="ID_1767357871" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
13
+ </node>
14
+ <node CREATED="1275756530989" ID="ID_1221806432" MODIFIED="1282822205361" TEXT="update_user">
15
+ <icon BUILTIN="bookmark"/>
16
+ </node>
17
+ </node>
18
+ <node CREATED="1275756504750" ID="ID_1382277695" MODIFIED="1355422424108" TEXT="pwd:change password">
19
+ <node CREATED="1275756515843" ID="ID_1559014937" MODIFIED="1330477842311" TEXT="enter: edit">
20
+ <icon BUILTIN="attach"/>
21
+ <node CREATED="1282816887988" ID="ID_2948144" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
22
+ </node>
23
+ <node CREATED="1275756530989" ID="ID_1566171053" MODIFIED="1275756553762" TEXT="change_password">
24
+ <icon BUILTIN="bookmark"/>
25
+ </node>
26
+ </node>
27
+ </node>
28
+ <node CREATED="1275752678377" ID="ID_1348489452" MODIFIED="1588883079396" TEXT="admins:Admin">
29
+ <node CREATED="1275752688167" ID="ID_229996461" MODIFIED="1275752690948" TEXT="role:a"/>
30
+ <node CREATED="1282722836614" ID="ID_1213363124" MODIFIED="1330477902602" TEXT="edit_role:edit user role">
31
+ <node CREATED="1282722862918" ID="ID_1190117882" MODIFIED="1330477922159" TEXT="select_user:select user">
32
+ <icon BUILTIN="attach"/>
33
+ <node CREATED="1282722901932" ID="ID_1859523490" MODIFIED="1282722903469" TEXT="role:a"/>
34
+ </node>
35
+ <node CREATED="1282722868801" ID="ID_1325872490" MODIFIED="1330477926538" TEXT="edit_role:edit role">
36
+ <icon BUILTIN="attach"/>
37
+ <node CREATED="1282722901932" ID="ID_1992100954" MODIFIED="1282722903469" TEXT="role:a"/>
38
+ </node>
39
+ <node CREATED="1282722907306" ID="ID_1709875397" MODIFIED="1282722922669" TEXT="update_role">
40
+ <icon BUILTIN="bookmark"/>
41
+ </node>
42
+ </node>
43
+ <node CREATED="1273913393454" ID="ID_1088166839" MODIFIED="1511159690490" TEXT="link: pending tasks: /jinda/pending"/>
44
+ <node CREATED="1275790679363" ID="ID_829325467" MODIFIED="1511159696044" TEXT="link: logs: /jinda/logs"/>
45
+ <node CREATED="1507573166973" ID="ID_351025910" MODIFIED="1511159700908" TEXT="link: docs: /jinda/doc"/>
46
+ </node>
47
+ <node CREATED="1273706796854" ID="ID_1003882979" MODIFIED="1588964401951" TEXT="devs: Developer">
48
+ <node CREATED="1275373154914" ID="ID_340725299" MODIFIED="1275373158632" TEXT="role:d"/>
49
+ <node CREATED="1275788317299" ID="ID_716276608" MODIFIED="1511159716471" TEXT="link: error_logs: /jinda/error_logs"/>
50
+ <node CREATED="1275788317299" ID="ID_1570419198" MODIFIED="1587858894833" TEXT="link: notice_logs: /jinda/notice_logs"/>
51
+ </node>
52
+ <node CREATED="1589756777499" FOLDED="true" ID="ID_853155456" MODIFIED="1592785016438" TEXT="docs: Document">
53
+ <node CREATED="1589757073388" ID="ID_1938238774" MODIFIED="1589772640862" TEXT="link: My Document: /docs/my">
54
+ <node CREATED="1589757125861" ID="ID_521286668" MODIFIED="1589757136547" TEXT="role:m"/>
55
+ </node>
56
+ <node CREATED="1589756879955" ID="ID_899042293" MODIFIED="1589910229085" TEXT="doc_new: New Document">
57
+ <node CREATED="1589756946117" ID="ID_1840278804" MODIFIED="1589910235469" TEXT="doc_form: Doc Form">
58
+ <icon BUILTIN="attach"/>
59
+ <node CREATED="1589757054618" ID="ID_642998203" MODIFIED="1589757059003" TEXT="role: m"/>
60
+ </node>
61
+ <node CREATED="1589757264764" ID="ID_1352102524" MODIFIED="1589772413612" TEXT="doc_update: Doc update">
62
+ <icon BUILTIN="bookmark"/>
63
+ </node>
64
+ </node>
65
+ <node CREATED="1493419562726" ID="ID_339628868" MODIFIED="1590424956484" TEXT="doc_edit: Edit Document">
66
+ <icon BUILTIN="button_cancel"/>
67
+ <node CREATED="1493419577933" ID="ID_801950372" MODIFIED="1590180699851" TEXT="doc_select: Select Document">
68
+ <icon BUILTIN="attach"/>
69
+ <node CREATED="1493479602815" ID="ID_761787946" MODIFIED="1493479606921" TEXT="role:m"/>
70
+ </node>
71
+ <node CREATED="1493419612720" ID="ID_1190499756" MODIFIED="1590180735204" TEXT="doc_edit: Edit Document">
72
+ <icon BUILTIN="attach"/>
73
+ <node CREATED="1493479557266" ID="ID_1216426484" MODIFIED="1493479561055" TEXT="role:m"/>
74
+ </node>
75
+ <node CREATED="1581400438157" ID="ID_447781815" MODIFIED="1590180242343" TEXT="doc_update: Doc_update">
76
+ <icon BUILTIN="bookmark"/>
77
+ </node>
78
+ </node>
79
+ <node CREATED="1495246388313" ID="ID_278169779" MODIFIED="1590180135106" TEXT="doc_xedit: Doc_hidden_menu">
80
+ <icon BUILTIN="button_cancel"/>
81
+ <node CREATED="1493419612720" ID="ID_541432768" MODIFIED="1590180160498" TEXT="doc_edit: Edit">
82
+ <icon BUILTIN="attach"/>
83
+ <node CREATED="1493479557266" ID="ID_1339913531" MODIFIED="1493479561055" TEXT="role:m"/>
84
+ </node>
85
+ <node CREATED="1581400438157" ID="ID_802199910" MODIFIED="1590180242343" TEXT="doc_update: Doc_update">
86
+ <icon BUILTIN="bookmark"/>
87
+ </node>
88
+ </node>
89
+ </node>
90
+ <node CREATED="1493393619430" ID="ID_554831343" MODIFIED="1592926786394" TEXT="notes: Notes">
91
+ <node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1589772615102" TEXT="link:My Notes: /notes/my">
92
+ <node CREATED="1493490295677" ID="ID_514416082" MODIFIED="1493490302239" TEXT="role:m"/>
93
+ </node>
94
+ <node CREATED="1493419257021" ID="ID_553734932" MODIFIED="1591278856955" TEXT="new: New Note">
95
+ <node CREATED="1493419299004" ID="ID_723334321" MODIFIED="1581351169990" TEXT="new_note: New ">
96
+ <icon BUILTIN="attach"/>
97
+ <node CREATED="1493479075294" ID="ID_1009521360" MODIFIED="1493479079687" TEXT="role:m"/>
98
+ </node>
99
+ <node CREATED="1493419491125" ID="ID_1125779183" MODIFIED="1581180747700" TEXT="create: Create">
100
+ <icon BUILTIN="bookmark"/>
101
+ </node>
102
+ <node CREATED="1591278861459" ID="ID_985992723" MODIFIED="1591319329198" TEXT="/notes/my">
103
+ <arrowlink DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" STARTARROW="None" STARTINCLINATION="0;0;"/>
104
+ <linktarget COLOR="#b0b0b0" DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" SOURCE="ID_985992723" STARTARROW="None" STARTINCLINATION="0;0;"/>
105
+ <icon BUILTIN="forward"/>
106
+ </node>
107
+ </node>
108
+ <node CREATED="1493419562726" FOLDED="true" ID="ID_1241171950" MODIFIED="1591278847249" TEXT="edit: Edit">
109
+ <node CREATED="1493419577933" ID="ID_1790163920" MODIFIED="1581350888992" TEXT="select_note: Select">
110
+ <icon BUILTIN="attach"/>
111
+ <node CREATED="1493479602815" ID="ID_1289003986" MODIFIED="1493479606921" TEXT="role:m"/>
112
+ </node>
113
+ <node CREATED="1493419612720" ID="ID_938262436" MODIFIED="1581350996674" TEXT="edit_note: Edit">
114
+ <icon BUILTIN="attach"/>
115
+ <node CREATED="1493479557266" ID="ID_211108947" MODIFIED="1493479561055" TEXT="role:m"/>
116
+ </node>
117
+ <node CREATED="1493419735921" ID="ID_1581002301" MODIFIED="1581180869775" TEXT="update: Update">
118
+ <icon BUILTIN="bookmark"/>
119
+ </node>
120
+ </node>
121
+ <node CREATED="1495246388313" FOLDED="true" ID="ID_320521408" MODIFIED="1591278851391" STYLE="fork" TEXT="delete:Delete">
122
+ <edge COLOR="#808080" STYLE="bezier" WIDTH="thin"/>
123
+ <node CREATED="1493419577933" ID="ID_1631275659" MODIFIED="1581350942681" TEXT="select_note: Select">
124
+ <icon BUILTIN="attach"/>
125
+ <node CREATED="1493479602815" ID="ID_851238107" MODIFIED="1493479606921" TEXT="role:m"/>
126
+ </node>
127
+ <node CREATED="1495246466176" ID="ID_1347765598" MODIFIED="1581799929028" TEXT="delete: Delete">
128
+ <icon BUILTIN="bookmark"/>
129
+ </node>
130
+ </node>
131
+ <node CREATED="1581531446494" FOLDED="true" ID="ID_1325232876" MODIFIED="1591278853597" TEXT="mail: Mail">
132
+ <node CREATED="1493419577933" FOLDED="true" ID="ID_1817148049" MODIFIED="1581531563343" TEXT="select_note: Select">
133
+ <icon BUILTIN="attach"/>
134
+ <node CREATED="1493479602815" ID="ID_1650154281" MODIFIED="1493479606921" TEXT="role:m"/>
135
+ </node>
136
+ <node CREATED="1581531468872" ID="ID_379926448" MODIFIED="1581564690354" TEXT="display_mail: Dsiplay Mail">
137
+ <icon BUILTIN="attach"/>
138
+ </node>
139
+ <node CREATED="1581564346466" ID="ID_1981382192" MODIFIED="1581564388041" TEXT="mail: Mail">
140
+ <icon BUILTIN="bookmark"/>
141
+ </node>
142
+ </node>
143
+ <node CREATED="1495246388313" FOLDED="true" ID="ID_807216843" MODIFIED="1590180066630" TEXT="xedit: Future use">
144
+ <icon BUILTIN="button_cancel"/>
145
+ <node CREATED="1493419612720" ID="ID_6864095" MODIFIED="1584999031935" TEXT="edit_note: Edit">
146
+ <icon BUILTIN="attach"/>
147
+ <node CREATED="1493479557266" ID="ID_297597260" MODIFIED="1493479561055" TEXT="role:m"/>
148
+ </node>
149
+ <node CREATED="1581400438157" ID="ID_1206027492" MODIFIED="1581400464170" TEXT="update: Update">
150
+ <icon BUILTIN="bookmark"/>
151
+ </node>
152
+ </node>
153
+ </node>
154
+ <node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1592785024002" TEXT="articles: Article">
155
+ <node CREATED="1493419096527" ID="ID_1521905276" MODIFIED="1493478060121" TEXT="link: All Articles: /articles"/>
156
+ <node CREATED="1493489768542" FOLDED="true" ID="ID_1376361427" MODIFIED="1589757167952" TEXT="link: My article: /articles/my">
157
+ <node CREATED="1493490295677" ID="ID_628476988" MODIFIED="1493490302239" TEXT="role:m"/>
158
+ </node>
159
+ <node CREATED="1493419257021" ID="ID_1355420049" MODIFIED="1588619429446" TEXT="new_article: New Article">
160
+ <node CREATED="1493419299004" ID="ID_1468250197" MODIFIED="1493419428686" TEXT="form_article: New Article">
161
+ <icon BUILTIN="attach"/>
162
+ <node CREATED="1493479075294" ID="ID_1145618514" MODIFIED="1493479079687" TEXT="role:m"/>
163
+ </node>
164
+ <node CREATED="1493419491125" ID="ID_1687683396" MODIFIED="1493483244848" TEXT="create: Create Article">
165
+ <icon BUILTIN="bookmark"/>
166
+ </node>
167
+ <node CREATED="1591278861459" ID="ID_657878492" MODIFIED="1591319807025" TEXT="/articles/my">
168
+ <arrowlink DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" STARTARROW="None" STARTINCLINATION="0;0;"/>
169
+ <linktarget COLOR="#b0b0b0" DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" SOURCE="ID_657878492" STARTARROW="None" STARTINCLINATION="0;0;"/>
170
+ <icon BUILTIN="forward"/>
171
+ </node>
172
+ </node>
173
+ <node CREATED="1493419562726" ID="ID_922854639" MODIFIED="1590180584955" TEXT="edit_article: Edit Article">
174
+ <node CREATED="1493419577933" ID="ID_938626803" MODIFIED="1538329139586" TEXT="select_article: Select Article">
175
+ <icon BUILTIN="attach"/>
176
+ <node CREATED="1493479602815" ID="ID_753056881" MODIFIED="1493479606921" TEXT="role:m"/>
177
+ </node>
178
+ <node CREATED="1493419612720" ID="ID_661682947" MODIFIED="1493524438941" TEXT="edit_article: Edit Article">
179
+ <icon BUILTIN="attach"/>
180
+ <node CREATED="1493479557266" ID="ID_1681993437" MODIFIED="1493479561055" TEXT="role:m"/>
181
+ </node>
182
+ <node CREATED="1493419735921" ID="ID_1575963748" MODIFIED="1593286858918" TEXT="j_update: Update Article">
183
+ <icon BUILTIN="bookmark"/>
184
+ </node>
185
+ <node CREATED="1591278861459" ID="ID_863187878" MODIFIED="1591319807025" TEXT="/articles/my">
186
+ <arrowlink DESTINATION="ID_863187878" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_604727235" STARTARROW="None" STARTINCLINATION="0;0;"/>
187
+ <linktarget COLOR="#b0b0b0" DESTINATION="ID_863187878" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_604727235" SOURCE="ID_863187878" STARTARROW="None" STARTINCLINATION="0;0;"/>
188
+ <icon BUILTIN="forward"/>
189
+ </node>
190
+ </node>
191
+ <node CREATED="1495246388313" ID="ID_1861034169" MODIFIED="1585001527103" TEXT="xedit_article: xEdit Article">
192
+ <icon BUILTIN="button_cancel"/>
193
+ <node CREATED="1495246432533" ID="ID_91386173" MODIFIED="1495267233398" TEXT="edit_article: Edit Article">
194
+ <icon BUILTIN="attach"/>
195
+ <node CREATED="1495246517185" ID="ID_1224073606" MODIFIED="1495246522964" TEXT="role:m"/>
196
+ </node>
197
+ <node CREATED="1495246466176" ID="ID_1635586443" MODIFIED="1593286876869" TEXT="j_update: Update Article">
198
+ <icon BUILTIN="bookmark"/>
199
+ </node>
200
+ </node>
201
+ </node>
202
+ <node CREATED="1493664700564" ID="ID_704959130" MODIFIED="1592950100226" TEXT="comments: Comment">
203
+ <icon BUILTIN="button_cancel"/>
204
+ <node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1591392666652" TEXT="new_comment: New Comment">
205
+ <icon BUILTIN="button_cancel"/>
206
+ <node CREATED="1493665192413" ID="ID_345629058" MODIFIED="1493665226422" TEXT="create">
207
+ <icon BUILTIN="bookmark"/>
208
+ <node CREATED="1493665231940" ID="ID_1645532530" MODIFIED="1493665237018" TEXT="role:m"/>
209
+ </node>
210
+ <node CREATED="1591278861459" ID="ID_170265872" MODIFIED="1591319807025" TEXT="/articles/my">
211
+ <arrowlink DESTINATION="ID_170265872" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_1468117" STARTARROW="None" STARTINCLINATION="0;0;"/>
212
+ <linktarget COLOR="#b0b0b0" DESTINATION="ID_170265872" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_1468117" SOURCE="ID_170265872" STARTARROW="None" STARTINCLINATION="0;0;"/>
213
+ <icon BUILTIN="forward"/>
214
+ </node>
215
+ </node>
216
+ <node CREATED="1494393494180" ID="ID_1101205873" MODIFIED="1495275996686" TEXT="role:m"/>
217
+ </node>
218
+ <node CREATED="1489875563330" FOLDED="true" ID="ID_1495015891" MODIFIED="1507248509212" TEXT="ctrs: ctrs&amp; Menu">
219
+ <node CREATED="1489875583646" ID="ID_1796125628" MODIFIED="1494393464288" TEXT="role:a"/>
220
+ <node CREATED="1275905802131" ID="ID_1960607342" MODIFIED="1489938927874" TEXT="vfolder1:Sub Menu 1">
221
+ <node CREATED="1275756515843" ID="ID_328242903" MODIFIED="1489939229748" TEXT="viewfile1: Title 1">
222
+ <icon BUILTIN="attach"/>
223
+ <node CREATED="1282816887988" ID="ID_1479413309" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
224
+ </node>
225
+ <node CREATED="1275756515843" ID="ID_1316819449" MODIFIED="1490683859703" TEXT="viewfile2: Title 2">
226
+ <icon BUILTIN="attach"/>
227
+ <node CREATED="1282816887988" ID="ID_1510989172" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
228
+ </node>
229
+ <node CREATED="1275756530989" ID="ID_171099141" MODIFIED="1489939276491" TEXT="update_viewfile1">
230
+ <icon BUILTIN="bookmark"/>
231
+ </node>
232
+ </node>
233
+ <node CREATED="1275756504750" ID="ID_914236141" MODIFIED="1489939000929" TEXT="vfolder2:Title 2">
234
+ <node CREATED="1275756515843" ID="ID_1222970183" MODIFIED="1489939293714" TEXT="viewfile2: Title 2">
235
+ <icon BUILTIN="attach"/>
236
+ <node CREATED="1282816887988" ID="ID_1312913420" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
237
+ </node>
238
+ </node>
239
+ </node>
240
+ <node CREATED="1494172726642" ID="ID_925257043" MODIFIED="1494172755433" TEXT="sitemap: Sitemap">
241
+ <node CREATED="1494172758253" ID="ID_961056168" MODIFIED="1494172797972" TEXT="sitemap: Sitemap"/>
242
+ <node CREATED="1494393494180" ID="ID_242460166" MODIFIED="1494393504971" TEXT="role:a"/>
243
+ </node>
244
+ <node CREATED="1493393619430" FOLDED="true" ID="ID_35210833" MODIFIED="1591392800862" TEXT="api/v1/notes: Notes API ">
245
+ <node CREATED="1493489768542" ID="ID_1053900670" MODIFIED="1591074318558" TEXT="link:My Notes: /api/v1/notes/my">
246
+ <icon BUILTIN="button_cancel"/>
247
+ <node CREATED="1493490295677" ID="ID_1597553308" MODIFIED="1493490302239" TEXT="role:m"/>
248
+ </node>
249
+ <node CREATED="1493419257021" ID="ID_1182560700" MODIFIED="1581180635669" TEXT="new: New Note">
250
+ <node CREATED="1493419299004" ID="ID_840380967" MODIFIED="1581351169990" TEXT="new_note: New ">
251
+ <icon BUILTIN="attach"/>
252
+ <node CREATED="1493479075294" ID="ID_10690659" MODIFIED="1493479079687" TEXT="role:m"/>
253
+ </node>
254
+ <node CREATED="1493419491125" ID="ID_924027059" MODIFIED="1581180747700" TEXT="create: Create">
255
+ <icon BUILTIN="bookmark"/>
256
+ </node>
257
+ </node>
258
+ <node CREATED="1493419562726" ID="ID_963001770" MODIFIED="1581180788218" TEXT="edit: Edit">
259
+ <node CREATED="1493419612720" ID="ID_1362613316" MODIFIED="1581350996674" TEXT="edit_note: Edit">
260
+ <icon BUILTIN="attach"/>
261
+ <node CREATED="1493479557266" ID="ID_1838104057" MODIFIED="1493479561055" TEXT="role:m"/>
262
+ </node>
263
+ <node CREATED="1493419735921" ID="ID_1445882396" MODIFIED="1581180869775" TEXT="update: Update">
264
+ <icon BUILTIN="bookmark"/>
265
+ </node>
266
+ </node>
267
+ <node CREATED="1495246388313" ID="ID_918406528" MODIFIED="1581340759604" STYLE="fork" TEXT="delete:Delete">
268
+ <edge COLOR="#808080" STYLE="bezier" WIDTH="thin"/>
269
+ <node CREATED="1493419577933" ID="ID_809771470" MODIFIED="1581350942681" TEXT="select_note: Select">
270
+ <icon BUILTIN="attach"/>
271
+ <node CREATED="1493479602815" ID="ID_1160875526" MODIFIED="1493479606921" TEXT="role:m"/>
272
+ </node>
273
+ <node CREATED="1495246466176" ID="ID_506410154" MODIFIED="1581799929028" TEXT="delete: Delete">
274
+ <icon BUILTIN="bookmark"/>
275
+ </node>
276
+ </node>
277
+ </node>
278
+ </node>
279
+ <node CREATED="1273819465949" FOLDED="true" ID="ID_855471610" MODIFIED="1583097143651" POSITION="right" TEXT="roles">
280
+ <node CREATED="1273819847470" ID="ID_1681080231" MODIFIED="1330477307826" TEXT="m: member"/>
281
+ <node CREATED="1273819855875" ID="ID_1429503284" MODIFIED="1330477311102" TEXT="a: admin"/>
282
+ <node CREATED="1273819859775" ID="ID_568365839" MODIFIED="1330477315009" TEXT="d: developer"/>
283
+ </node>
284
+ <node CREATED="1273819456867" FOLDED="true" ID="ID_1677010054" MODIFIED="1591392810437" POSITION="left" TEXT="models">
285
+ <node CREATED="1292122118499" FOLDED="true" ID="ID_1957754752" MODIFIED="1493705885123" TEXT="person">
286
+ <node CREATED="1292122135809" ID="ID_1617970069" MODIFIED="1332878659106" TEXT="fname"/>
287
+ <node CREATED="1292122150362" ID="ID_1200135538" MODIFIED="1332878662388" TEXT="lname"/>
288
+ <node CREATED="1332876694150" ID="ID_1770958985" MODIFIED="1332876730552" TEXT="sex: integer">
289
+ <node CREATED="1332878665790" ID="ID_793089342" MODIFIED="1332878668499" TEXT="1: male"/>
290
+ <node CREATED="1332878669085" ID="ID_1796007763" MODIFIED="1332878673144" TEXT="2: female"/>
291
+ </node>
292
+ <node CREATED="1292123322429" ID="ID_1509464300" MODIFIED="1332878620176" TEXT="belongs_to :address">
293
+ <icon BUILTIN="edit"/>
294
+ </node>
295
+ <node CREATED="1292122156430" ID="ID_604231613" MODIFIED="1292122161324" TEXT="dob: date"/>
296
+ <node CREATED="1286576968143" ID="ID_936807610" MODIFIED="1332878681362" TEXT="phone"/>
297
+ <node CREATED="1290823140269" ID="ID_1957301629" MODIFIED="1332878684453" TEXT="photo"/>
298
+ </node>
299
+ <node CREATED="1292122236285" FOLDED="true" ID="ID_959987887" MODIFIED="1493768919147" TEXT="address">
300
+ <node CREATED="1292122254622" ID="ID_430517150" MODIFIED="1355422372241" TEXT="address_street"/>
301
+ <node CREATED="1355422373525" ID="ID_1797865138" MODIFIED="1355422378352" TEXT="city"/>
302
+ <node CREATED="1355422378959" ID="ID_1964490487" MODIFIED="1355422380765" TEXT="state"/>
303
+ <node CREATED="1355422381231" ID="ID_1226075540" MODIFIED="1355422382748" TEXT="zip"/>
304
+ <node CREATED="1332876680122" ID="ID_65427990" MODIFIED="1332876682148" TEXT="phone"/>
305
+ <node CREATED="1292243471343" ID="ID_1859608350" MODIFIED="1310195256623" TEXT="lat: float"/>
306
+ <node CREATED="1292243477436" ID="ID_48497260" MODIFIED="1310195262534" TEXT="lng: float"/>
307
+ </node>
308
+ <node CREATED="1493418879485" FOLDED="true" ID="ID_1995497233" MODIFIED="1583097163789" TEXT="article">
309
+ <node CREATED="1493418891110" ID="ID_364756011" MODIFIED="1493418905253" TEXT="title"/>
310
+ <node CREATED="1493418906868" ID="ID_1676483995" MODIFIED="1493418911919" TEXT="text"/>
311
+ <node CREATED="1493487131376" ID="ID_1334057464" MODIFIED="1538328284823" TEXT="belongs_to :user, :class_name =&gt; &quot;User&quot;">
312
+ <icon BUILTIN="edit"/>
313
+ </node>
314
+ <node CREATED="1493705838166" ID="ID_408271104" MODIFIED="1493705877062" TEXT="has_many :comments">
315
+ <icon BUILTIN="edit"/>
316
+ </node>
317
+ <node CREATED="1493718773517" ID="ID_944554146" MODIFIED="1493718808965" TEXT="validates :title, :text, :user_id, presence: true">
318
+ <icon BUILTIN="edit"/>
319
+ </node>
320
+ <node CREATED="1494181636998" ID="ID_229502630" MODIFIED="1494181660419" TEXT="body"/>
321
+ <node CREATED="1497913676275" ID="ID_404103076" MODIFIED="1497913685065" TEXT="keywords"/>
322
+ </node>
323
+ <node CREATED="1493418915637" FOLDED="true" ID="ID_429078131" MODIFIED="1583097162517" TEXT="comment">
324
+ <node CREATED="1493418939760" ID="ID_1251093062" MODIFIED="1493418943423" TEXT="body"/>
325
+ <node CREATED="1493418945686" ID="ID_911071644" MODIFIED="1493418986711" TEXT="belongs_to :article">
326
+ <icon BUILTIN="edit"/>
327
+ </node>
328
+ <node CREATED="1493643129947" ID="ID_588013696" MODIFIED="1493643146424" TEXT="belongs_to :user">
329
+ <icon BUILTIN="edit"/>
330
+ </node>
331
+ <node CREATED="1493718512191" ID="ID_173203253" MODIFIED="1493718583874" TEXT="validates :body, :user_id, :article_id, presence: true">
332
+ <icon BUILTIN="edit"/>
333
+ </node>
334
+ </node>
335
+ <node CREATED="1494040082403" FOLDED="true" ID="ID_864577403" MODIFIED="1583097161145" TEXT="picture">
336
+ <node CREATED="1494040091583" ID="ID_679208099" MODIFIED="1494040119098" TEXT="picture"/>
337
+ <node CREATED="1494040120208" ID="ID_1266154874" MODIFIED="1494040125130" TEXT="description"/>
338
+ <node CREATED="1493487131376" ID="ID_1422817360" MODIFIED="1493487186856" TEXT="belongs_to :user">
339
+ <icon BUILTIN="edit"/>
340
+ </node>
341
+ </node>
342
+ <node CREATED="1581177067029" FOLDED="true" ID="ID_1450593753" MODIFIED="1583089083450" TEXT="note">
343
+ <node CREATED="1581243923100" ID="ID_537548385" MODIFIED="1581243965554" TEXT="include Mongoid::Attributes::Dynamic">
344
+ <icon BUILTIN="edit"/>
345
+ </node>
346
+ <node CREATED="1581177848957" ID="ID_1611227370" MODIFIED="1581177857470" TEXT="title"/>
347
+ <node CREATED="1581177867775" ID="ID_88547965" MODIFIED="1581177883555" TEXT="body"/>
348
+ <node CREATED="1493643129947" ID="ID_1655403736" MODIFIED="1493643146424" TEXT="belongs_to :user">
349
+ <icon BUILTIN="edit"/>
350
+ </node>
351
+ <node CREATED="1581984419312" ID="ID_1934899110" MODIFIED="1581985586488" TEXT="before_validation :ensure_title_has_a_value ">
352
+ <icon BUILTIN="edit"/>
353
+ </node>
354
+ <node CREATED="1581495182445" ID="ID_1430552418" MODIFIED="1581985664674" TEXT="validates :title, length: { maximum: (MAX_TITLE_LENGTH = 30), message: &quot;Must be less than 30 characters&quot; }, presence: true">
355
+ <icon BUILTIN="edit"/>
356
+ </node>
357
+ <node CREATED="1581495221779" ID="ID_1231500988" MODIFIED="1581985709585" TEXT="validates :body, length: { maximum: (MAX_BODY_LENGTH = 1000), message: &quot;Must be less than 1000 characters&quot;} ">
358
+ <icon BUILTIN="edit"/>
359
+ </node>
360
+ <node CREATED="1581986280028" ID="ID_1069060625" MODIFIED="1581987310544" TEXT="private&#xa; def ensure_title_has_a_value&#xa; if title.blank?&#xa; self.title = body[0..(MAX_TITLE_LENGTH-1)] unless body.blank?&#xa; end&#xa; end&#xa; &#xa;">
361
+ <icon BUILTIN="edit"/>
362
+ </node>
363
+ </node>
364
+ </node>
365
+ </node>
366
+ </map>
data/lib/generators/jinda/templates/app/models/comment.rb CHANGED
@@ -4,8 +4,10 @@ class Comment
4
4
  # jinda begin
5
5
  include Mongoid::Timestamps
6
6
  field :body, :type => String
7
- belongs_to :article
8
- belongs_to :user, :class_name => "User"
9
- validates :body, :user_id, :article_id, presence: true
7
+ belongs_to :article, :class_name => "Article"
8
+ belongs_to :user, :class_name => "User"
9
+ belongs_to :job, :class_name => "Job"
10
+ belongs_to :commentable, polymorphic: true
11
+ index({ commentable_id: 1, commentable_type: 1})
10
12
  # jinda end
11
13
  end
data/lib/generators/jinda/templates/app/views/articles/show.html.haml CHANGED
@@ -17,7 +17,8 @@
17
17
  -#
18
18
  - if login?
19
19
  %h3 Add a comment:
20
- = form_for([@comment, @article.comments.build]) do |f|
20
+ =# form_for([@comment, @article.comments.build]) do |f|
21
+ = form_with(model: [@article, Comment.new], local: true) do |f|
21
22
  = f.hidden_field :article_id, :value => @article.id
22
23
  = f.label :body, "Comment"
23
24
  = f.text_area :body
data/lib/generators/jinda/templates/app/views/jinda/_menu.haml CHANGED
@@ -4,7 +4,8 @@
4
4
  %div{"data-role" => "header", "data-theme" => "b", "data-backbtn"=>"false"}
5
5
  %h1= head
6
6
  %div{"data-role" => "content", "data-id" => "menu_mm"}
7
- %ul{"data-role" => "listview", "data-theme" => "g"}
7
+ %form.ui-filterable
8
+ %ul{"data-role" => "listview", "data-theme" => "g", "data-filter" => "true"}
8
9
  %li
9
10
  %a{"data-panel" => "main", "data-id" => "home", :href => "/jinda"} Home
10
11
  = render :partial => "jinda/menu_mm"
data/lib/generators/jinda/templates/app/views/jinda/index.html.haml CHANGED
@@ -1,43 +1,53 @@
1
- .container
1
+ .content-header
2
2
  %div(style="text-align:center")
3
3
  = image_tag "logo_jinda.png"
4
-
5
-
6
- %h2 Current gems version found:
7
- %ul
8
- %li Ruby Version #{RUBY_VERSION }
9
- %li Rails Version #{Rails.version }
10
- %li gem jinda #{Gem.loaded_specs['jinda'].version}
11
-
12
-
13
-
14
- %h2 Recently tested with:
15
- %ul
16
- %li Rubygems 2.7.1
17
- %li Rails 6.0.3
18
- %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record --skip-javascript --skip-turbolinks
19
- %li (rails new YOURAPP -BOTJ)
20
-
21
-
22
- %h2 Installation
23
- %ul
24
- %li add gem 'jinda', '0.5.8'
25
- %li bundle
26
- %li rails generate jinda:install
27
- %li (run all with "sh install.sh" )
28
- %li bundle
29
- %li rails generate jinda:config
30
- %li rails jinda:seed, will create initial user:password admin:secret
31
- %li when update app/jinda/index.mm, run rake jinda:update
32
-
33
-
34
- %h2 Option: Themes available: Jinda_adminbsb, Jinda_adminlte
35
- %ul
36
- %li To install gem 'jinda_adminlte'
37
- %li Install
38
- %li gem 'jinda_adminlte'
39
- %li Then
40
- %li $ bundle
41
- %li $ rails generate jinda_adminlte:install
42
-
43
-
4
+ %ol.breadcrumb
5
+ %li.fa.fa-dashboard
6
+ Dashboard
7
+ .content
8
+ %div.row::before
9
+ %div.col-lg-3.col-xs-6
10
+ %div.small-box.bg-aqua
11
+ %div.inner
12
+ %b Current gems version found:
13
+ %ul
14
+ %li Ruby Version #{RUBY_VERSION }
15
+ %li Rails Version #{Rails.version }
16
+ %li gem jinda #{Gem.loaded_specs['jinda'].version}
17
+ %div.col-lg-3.col-xs-6
18
+ %div.small-box.bg-green
19
+ %div.inner
20
+ %b Recently tested with:
21
+ %ul
22
+ %li Rubygems 2.7.1
23
+ %li Rails 6.0.3
24
+ %div.col-lg-3.col-xs-6
25
+ %div.small-box.bg-yellow
26
+ %div.inner
27
+ %b Create New Rails:
28
+ %ul
29
+ %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record --skip-javascript --skip-turbolinks
30
+ %li (rails new YOURAPP -BOTJ)
31
+ %div.col-lg-3.col-xs-6
32
+ %div.small-box.bg-red
33
+ %div.inner
34
+ %b Installation
35
+ %ul
36
+ %li add gem 'jinda', '0.5.8' to Gemfile then $ bundle
37
+ %li rails generate jinda:install, then bundle
38
+ %li rails generate jinda:config
39
+ %li rails jinda:seed, will create initial user:password admin:secret
40
+ %li when update app/jinda/index.mm, run rake jinda:update
41
+ %div.col-lg-3.col-xs-6
42
+ %div.small-box.bg-blue
43
+ %div.inner
44
+ %b Option: Themes available: Jinda_adminbsb, Jinda_adminlte
45
+ %ul
46
+ %li To install gem 'jinda_adminlte'
47
+ %li Install
48
+ %li gem 'jinda_adminlte'
49
+ %li Then
50
+ %li $ bundle
51
+ %li $ rails generate jinda_adminlte:install
52
+
53
+
data/lib/jinda/helpers.rb CHANGED
@@ -430,6 +430,7 @@ module Jinda
430
430
  # ##########################################################################
431
431
  # create or update to GmaModule
432
432
  ma_module= Jinda::Module.find_or_create_by :code=>module_code
433
+ binding.pry
433
434
  ma_module.update_attributes :uid=>ma_module.id.to_s, :icon=>menu_icon
434
435
  protected_modules << ma_module.uid
435
436
  name = module_code if name.blank?
@@ -645,7 +646,10 @@ module Jinda
645
646
  if a[:edit]
646
647
  doc += " #{a[:text]}\n"
647
648
  else
648
- doc += " field :#{a[:code]}, :type => #{a[:type].capitalize}\n"
649
+ # Fixed: Capitalize only first char
650
+ # doc += " field :#{a[:code]}, :type => #{a[:type].capitalize}\n"
651
+ a[:type][0] = a[:type][0].capitalize
652
+ doc += " field :#{a[:code]}, :type => #{a[:type]}\n"
649
653
  end
650
654
  end
651
655
  doc += " #{@etext}\n"
@@ -853,7 +857,8 @@ module Jinda
853
857
  'folder'
854
858
  when 'mail'
855
859
  'mail'
856
- when 'xmag' # Tobe discussed
860
+ # when 'xmag' # Tobe discussed
861
+ when 'To be discusssed'
857
862
  'search'
858
863
  end
859
864
  end
data/lib/jinda/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Jinda
2
- VERSION = "0.5.8"
2
+ VERSION = "0.6.3"
3
3
  end
metadata CHANGED
@@ -1,30 +1,16 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jinda
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.8
4
+ version: 0.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Prateep Kul
8
8
  - Korakot Leemakdej
9
- autorequire:
9
+ autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2020-07-01 00:00:00.000000000 Z
12
+ date: 2020-11-13 00:00:00.000000000 Z
13
13
  dependencies:
14
- - !ruby/object:Gem::Dependency
15
- name: bundler
16
- requirement: !ruby/object:Gem::Requirement
17
- requirements:
18
- - - "~>"
19
- - !ruby/object:Gem::Version
20
- version: '1.16'
21
- type: :development
22
- prerelease: false
23
- version_requirements: !ruby/object:Gem::Requirement
24
- requirements:
25
- - - "~>"
26
- - !ruby/object:Gem::Version
27
- version: '1.16'
28
14
  - !ruby/object:Gem::Dependency
29
15
  name: rake
30
16
  requirement: !ruby/object:Gem::Requirement
@@ -43,40 +29,40 @@ dependencies:
43
29
  name: activesupport
44
30
  requirement: !ruby/object:Gem::Requirement
45
31
  requirements:
46
- - - ">="
32
+ - - "~>"
47
33
  - !ruby/object:Gem::Version
48
34
  version: 4.1.11
49
- - - "~>"
35
+ - - ">="
50
36
  - !ruby/object:Gem::Version
51
37
  version: 4.1.11
52
38
  type: :development
53
39
  prerelease: false
54
40
  version_requirements: !ruby/object:Gem::Requirement
55
41
  requirements:
56
- - - ">="
42
+ - - "~>"
57
43
  - !ruby/object:Gem::Version
58
44
  version: 4.1.11
59
- - - "~>"
45
+ - - ">="
60
46
  - !ruby/object:Gem::Version
61
47
  version: 4.1.11
62
48
  - !ruby/object:Gem::Dependency
63
49
  name: mongoid
64
50
  requirement: !ruby/object:Gem::Requirement
65
51
  requirements:
66
- - - ">="
52
+ - - "~>"
67
53
  - !ruby/object:Gem::Version
68
54
  version: 4.1.11
69
- - - "~>"
55
+ - - ">="
70
56
  - !ruby/object:Gem::Version
71
57
  version: 4.1.11
72
58
  type: :development
73
59
  prerelease: false
74
60
  version_requirements: !ruby/object:Gem::Requirement
75
61
  requirements:
76
- - - ">="
62
+ - - "~>"
77
63
  - !ruby/object:Gem::Version
78
64
  version: 4.1.11
79
- - - "~>"
65
+ - - ">="
80
66
  - !ruby/object:Gem::Version
81
67
  version: 4.1.11
82
68
  description: 'Generate Rails workflow from mind map: Freemind'
@@ -235,6 +221,7 @@ files:
235
221
  - lib/generators/jinda/templates/app/helpers/sitemap_helper.rb
236
222
  - lib/generators/jinda/templates/app/helpers/users_helper.rb
237
223
  - lib/generators/jinda/templates/app/jinda/index.mm
224
+ - lib/generators/jinda/templates/app/jinda/template/index.mm
238
225
  - lib/generators/jinda/templates/app/jinda/template/linkview.haml
239
226
  - lib/generators/jinda/templates/app/jinda/template/view.html.erb
240
227
  - lib/generators/jinda/templates/app/mailers/application_mailer.rb
@@ -390,7 +377,7 @@ homepage: https://github.com/kul1/jinda
390
377
  licenses:
391
378
  - MIT
392
379
  metadata: {}
393
- post_install_message:
380
+ post_install_message:
394
381
  rdoc_options: []
395
382
  require_paths:
396
383
  - lib
@@ -405,8 +392,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
405
392
  - !ruby/object:Gem::Version
406
393
  version: '0'
407
394
  requirements: []
408
- rubygems_version: 3.0.8
409
- signing_key:
395
+ rubygems_version: 3.1.4
396
+ signing_key:
410
397
  specification_version: 4
411
398
  summary: 'Rails workflow from mind map: Freemind'
412
399
  test_files: []