jinda 0.7.2 → 0.7.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: faef5ea06cc850bbbf7ebb2b1f8d3ac4e59688d0b5197c124bc4ca525b2ce466
4
- data.tar.gz: f84ac716bb2ae580fcfeda5178544f7809440ae998c1f0cd263bbdfd5f58e1ae
3
+ metadata.gz: 2ed59d0a776091a540cfb3dc8529d9ddb11c0ca4f94cdf40b277957432d300a1
4
+ data.tar.gz: 7e5d9f3308145ee6241c0aca617325e62068571111c22de905119043acaf61ac
5
5
  SHA512:
6
- metadata.gz: 1ab17b915d572b178f1d709037c9b1af2ed64db23b14d8cb36d68c1c010bb0e75dabcc8c1e1172acc628826f591ee4ef4278137191a53bfe1c0454b42858f274
7
- data.tar.gz: 1404b46acb45165bccd3087926380ee9bf986edee9f8726691a5037ef25504b7b3b56d6ab3e467e752d9e2ac506a0d7e5d6198b1db07c795a2fc13210e1e4e13
6
+ metadata.gz: 7265365e8f612ee25707ae76c080b61790b458023d9953179ae43e91e5e779d67baedaa91c37694c34da4d74b159e5f25849ede86d3ec9e2fa4f54961cd97762
7
+ data.tar.gz: 6bb86d8ef01fd4346214acab6de8395293d1c8d18771495db4378ba97cbdecd22ba36e4dbe0de9c9ca05adf497ed56fb3a55a23c1ccefec1d647fe45e214e1fa
@@ -1,10 +1,5 @@
1
1
  .box.box-info
2
2
  .box-header.with-border
3
-
4
- %h3.box-title
5
- = @page_title
6
- .label-warning
7
- = flash[:notice]
8
3
  .box-tools.pull-right
9
4
  %button.btn.btn-box-tool{"data-widget" => "collapse", :type => "button"}
10
5
  %i.fa.fa-minus
@@ -4,43 +4,44 @@
4
4
  .container
5
5
  %div.row::before
6
6
  %div.col-md-12
7
- %h2.display-3.mt-5.pt-5
8
- = @article.title
9
- = 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" }
10
- %hr
11
- = @article.text
12
- %h4.display-5
13
- = @article.body.html_safe
14
- - @comments.each do |comment|
15
- %div#article-comment.ui-corner-all
16
- .col-md-10.col-sm-12
17
- %div.small-box.bg-gray
18
- %div.inner
19
- %div.font-weight-light
20
- Author:
21
- %b= comment.name if comment.name
22
- %div#comment-body
23
- %i= comment.body
24
- %hr
25
-
26
- .container
27
- .card
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
- %h4.display-5
31
- Add a comment:
32
- = form_with(model: [@article, Comment.new], local: true) do |f|
33
- .form-group
34
- = f.hidden_field :article_id, :value => @article.id
35
- .form-group
36
- = f.label :body, "Comment"
37
- .form-group
38
- = f.text_area :body, rows: 5, class: "form-control"
39
- .form-group
40
- = f.hidden_field :user_id, :value => current_ma_user.id
41
- .form-group
42
- = f.hidden_field :name, :value => current_ma_user.code
43
- .form-group
44
- = f.hidden_field :image, :value => current_ma_user.image
45
- .form-group
46
- = f.submit "Submit", class: "btn btn-default btn-success"
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"
@@ -1,163 +1,168 @@
1
1
 
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
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
- 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)
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
- # 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
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
- 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
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
- alias :ma_notice :ma_log
84
+ alias :ma_notice :ma_log
85
85
 
86
- # methods from application_helper
87
- def markdown(text)
88
- erbified = ERB.new(text.html_safe).result(binding)
89
- red = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
90
- red.render(erbified).html_safe
91
- end
92
- def align_text(s, pixel=3)
93
- "<span style='position:relative; top:-#{pixel}px;'>#{s}</span>".html_safe
94
- end
95
- def status_icon(status)
96
- case status
97
- when 'R'
98
- image_tag 'user.png'
99
- when 'F'
100
- image_tag 'tick.png'
101
- when 'I'
102
- image_tag 'control_play.png'
103
- when 'E'
104
- image_tag 'logout.png'
105
- when 'X'
106
- image_tag 'cross.png'
107
- else
108
- image_tag 'cancel.png'
109
- end
110
- end
111
- def role_name(code)
112
- role= Jinda::Role.where(code:code).first
113
- return role ? role.name : ""
114
- end
115
- def uncomment(s)
116
- s.sub(/^#\s/,'')
117
- end
118
- def code_div(s)
119
- "<pre style='background-color: #efffef;'><code class='ruby' lang='ruby'> #{s}</code></pre>".html_safe
120
- end
121
- def ajax?(s)
122
- return s.match('file_field') ? false : true
123
- end
124
- def step(s, total) # square text
125
- s = (s==0)? 1: s.to_i
126
- total = total.to_i
127
- out ="<div class='step'>"
128
- (s-1).times {|ss| out += "<span class='steps_done'>#{(ss+1)}</span>" }
129
- out += %Q@<span class='step_now' >@
130
- out += s.to_s
131
- out += "</span>"
132
- out += %Q@@
133
- for i in s+1..total
134
- out += "<span class='steps_more'>#{i}</span>"
135
- end
136
- out += "</div>"
137
- out.html_safe
138
- end
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
- def current_ma_user
141
- # if session[:user_id]
142
- # return @user ||= User.find(session[:user_id]['$oid'])
143
- # else
144
- # return nil
145
- # end
146
- #@user ||= User.find_by_auth_token!(cookies[:auth_token]) if cookies[:auth_token]
147
- @user ||= User.where(:auth_token => cookies[:auth_token]).first if cookies[:auth_token]
148
- return @user
149
- end
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
- def ui_action?(s)
152
- %w(form output mail pdf).include? s
153
- end
154
- # def handle_ma_notice
155
- # if Jinda::Notice.recent.count>0
156
- # notice= Jinda::Notice.recent.last
157
- # notice.update_attribute :unread, false
158
- # "<script>notice('#{notice.message}');</script>"
159
- # else
160
- # ""
161
- # end
162
- # end
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
 
@@ -1,3 +1,3 @@
1
1
  module Jinda
2
- VERSION = "0.7.2"
2
+ VERSION = "0.7.3"
3
3
  end
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.2
4
+ version: 0.7.3
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-01-19 00:00:00.000000000 Z
12
+ date: 2021-01-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake