jinda 0.5.3 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69bfafef87f66a61669d13ec1fb0e35b33856d04c4c0576a3195db8f4afa2cd4
-  data.tar.gz: a9e44d8bdb20895533f9f98386df69fd9a1b5d70e80202bca462842cd518489b
+  metadata.gz: 5437584419d20b8bf830bee5b254f52d79da72b0c7a63e4cff973a7c10156394
+  data.tar.gz: ec3d5a1838787b031e5072fb682b39a592edec96efabf8d3760327a4f832fb27
 SHA512:
-  metadata.gz: b8b323cfb30d466d54619b7df410e11ee6cdf0c1c3527ec1be81e775228d1d47803ed51441054bbeb31e950e95e583b14431a41bc26f3236bd8e13cd232378ce
-  data.tar.gz: 34ba2f9c60c3934aa957ae288161126566255dc83401840477a37fd19b22d4b010fa2bc20deb4de2517365045912fb67306bdcfcee718e1d6619bde276821946
+  metadata.gz: 332c30c673a0107c09994ba8c394751789a018d9957adac57839413d86f8dea0f306714f435afeb22d0c9a6e6b34e8278be6f1306c096824e422ef9605a8052c
+  data.tar.gz: 110fb30d49712728b1988754995712612dd1c820c79f829c571fb89e02466fa37d7d300b72276355f2a47e8d0c537474bc24dbddefc5902be7a5002fb761943b

data/README.md

@@ -40,7 +40,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.5.3'
+    gem 'jinda', '~> 0.5.8'
 
 For Development (most updated)
 

data/lib/generators/jinda/install_generator.rb

@@ -110,15 +110,18 @@ module Jinda
         route "resources :users"
         route "resources :docs"
         route "resources :notes"
-        route "resources :articles"
+        route "resources :comments"
+        route "resources :articles do resources :comments end"
         route "get '/jinda/document/:id' => 'jinda#document'"
         route "get '/notes/destroy/:id' => 'notes#destroy'"
         route "get '/notes/my/destroy/:id' => 'notes#destroy'"
         route "get '/docs/my/destroy' => 'docs#destroy'"
         route "get '/notes/my' => 'notes/my'"
         route "get '/docs/my' => 'docs/my'"
+        route "get '/articles/edit' => 'articles/edit'"
+        route "get '/articles/show' => 'articles/show'"
 		    route "get '/articles/my/destroy' => 'articles#destroy'"
-        route "get '/articles/my' => 'articles/my'"
+        route "get '/articles/my' => 'articles#my'"
         route "get '/logout' => 'sessions#destroy', :as => 'logout'"
         route "get '/auth/failure' => 'sessions#destroy'"
         route "get '/auth/:provider/callback' => 'sessions#create'"
@@ -130,6 +133,7 @@ module Jinda
         route "post '/jinda/init' => 'jinda#init'"
         route "jinda_methods.each do \|aktion\| get \"/jinda/\#\{aktion\}\" => \"jinda#\#\{aktion\}\" end"
         route "jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']"
+        route "jinda_methods += ['run_redirect', 'run_direct_to','run_if']"
         route "jinda_methods += ['init', 'run', 'run_mail', 'document', 'run_do', 'run_form', 'end_form']"
         route "jinda_methods = ['pending', 'status', 'search', 'doc', 'doc_print', 'logs', 'ajax_notice']"  
         route "\# start jiinda method routes"

data/lib/generators/jinda/templates/app/assets/stylesheets/app.scss

@@ -1,14 +1,19 @@
 
+#article-title {
+  text-align: left;
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  color:#333;
+}
+
 #title {
   font-size: 14pt;
   font-weight: bold;
-  text-align: center;
-  background: #d2f0ff;
+  text-align: left;
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
   color:#333;
 
 }
-#text {
+#text{
   font-size: 14pt;
   font-weight: bold;
   text-align:left;
@@ -41,7 +46,6 @@
 #table th {
   background-color: #bcecff;
   color:#333;
-;
   width:100%;
 }
 
@@ -59,12 +63,14 @@
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
   /*font-size: 110%;*/
 }
-.ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: 7px 75px 7px 15px; display: block; }
+.ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: 7px 75px 7px 7px; display: block; }
 .ui-link-inherit { font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;}
 label.ui-input-text {
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
   /*font-size: 110%;*/
   text-shadow: none;
+  margin: 2% 2% 0 0;
+
 }
 label.ui-select {
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;

data/lib/generators/jinda/templates/app/assets/stylesheets/articles.scss

@@ -1,16 +1,28 @@
 
-#article-title {
+
+#article-table {
   font-size: 14pt;
   font-weight: bold;
-  text-align: center;
-  background: #d2f0ff;
+  text-align: left;
+  background:#f7f7f7;
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  padding:2px 5px;
   color:#333;
 
 }
-#article-text {
+
+#article-title {
   font-size: 14pt;
   font-weight: bold;
+  text-align: left;
+  background:#f7f7f7;
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  padding:2px 5px;
+  color:#333;
+
+}
+#article-text {
+  font-size: 8pt;
   text-align:left;
   border:1px solid #c1c1c1;
   background:#f7f7f7;
@@ -28,7 +40,6 @@
 
 #comment-body {
   font-size: 10pt;
-  font-weight: bold;
   text-align:left;
   color:#333;
 }
@@ -41,7 +52,6 @@
 #article-table th {
   background-color: #bcecff;
   color:#333;
-;
   width:100%;
 }
 

data/lib/generators/jinda/templates/app/controllers/concerns/jinda_run_concern.rb

@@ -60,6 +60,20 @@ module JindaRunConcern
     end_action(next_runseq)
   end
 
+  # redirect when finish last runseq
+  # eg: http://localhost:3000/notes/my
+  def run_direct_to
+    init_vars(params[:id])
+    next_runseq= @xmain.runseqs.where(:id.ne=>@runseq.id, :code=>@runseq.code).first
+    if !@runseq.code.blank? 
+      @xvars['p']['return'] = @runseq.code
+    else
+      flash[:notice]= "Error: missing required forward path in Freemind"
+      ma_log "Error: require forward path in Freemind"
+    end
+    end_action(next_runseq)
+  end
+
   def run_redirect
     init_vars(params[:id])
     # next_runseq= @xmain.runseqs.first :conditions=>["id != ? AND code = ?",@runseq.id, @runseq.code]

data/lib/generators/jinda/templates/app/controllers/jinda_org/application_controller.rb

@@ -1,5 +1,4 @@
 class ApplicationController < ActionController::Base
-  # https://www.cookieshq.co.uk/posts/easy-seo-metatags-with-rails-4#a-word-about-turbolinks
   before_action :prepare_meta_tags, if: -> { request.get? }
   # CSRF protection is turned on with the protect_from_forgery method. 
   protect_from_forgery unless: -> { request.format.json? }

data/lib/generators/jinda/templates/app/controllers/jinda_org/articles_controller.rb

@@ -1,23 +1,30 @@
 class ArticlesController < ApplicationController
-  before_action :load_article, only: [:show,]
-  before_action :load_edit_article, only: [:edit, :destroy]
-  before_action :load_comments, only: [:show]
+ before_action :load_articles, except: [:destroy] 
+ before_action :load_my_articles, only: [:my]
+ before_action :load_article, only: [:destroy, :edit]
 
 	def index
-    @articles = Article.desc(:created_at).page(params[:page]).per(10)
+    # before_action
 	end
 
-  def show 
+  def my
+    # before_action
+  end
+
+  def show
+    @article = Article.find(params[:article_id])
+    @comments = @article.comments.desc(:created_at).page(params[:page]).per(10)
     prepare_meta_tags(title: @article.title,
                       description: @article.text,
                       keywords: @article.keywords)
   end
 
   def edit
-    @page_title       = 'Member Login'
+    @page_title       = 'Edit Article'
   end
 
   def create
+    # Use Jinda $xvars
     @article = Article.new(
                       title: $xvars["form_article"]["title"],
                       text: $xvars["form_article"]["text"],
@@ -27,51 +34,69 @@ class ArticlesController < ApplicationController
     @article.save!
   end
 
-  def my
-    @articles = Article.where(user_id: current_ma_user).desc(:created_at).page(params[:page]).per(10)
-    @page_title       = 'Member Login'
+  def update
+    @article = Article.find(params[:id])
+    @article.update(
+                    title: params["article"]["title"],
+                    text: params["article"]["text"],
+                    keywords: params["article"]["keywords"],
+                    body: params["article"]["body"]
+										)
+    redirect_to :action=> 'show', :article_id => @article.id
   end
 
-  def update
-    # $xvars["select_article"] and $xvars["edit_article"]
-		# These are variables with params when called
-    # They contain everything that we get their forms select_article and edit_article
-  
-		article_id = $xvars["select_article"] ? $xvars["select_article"]["title"] : $xvars["p"]["article_id"]
-    @article = Article.find(article_id)
-    @article.update(title: $xvars["edit_article"]["title"],
-                    text: $xvars["edit_article"]["text"],
-                    keywords: $xvars["edit_article"]["keywords"],
-                    body: $xvars["edit_article"]["body"]
+  def j_update
+    # Use Jinda $xvars
+		@article_id = $xvars["select_article"] ? $xvars["select_article"]["title"] : $xvars["p"]["article_id"]
+    @article = Article.find_by :id => @article_id
+    @article.update(title: $xvars["edit_article"]["article"]["title"],
+                    text: $xvars["edit_article"]["article"]["text"],
+                    keywords: $xvars["edit_article"]["article"]["keywords"],
+                    body: $xvars["edit_article"]["article"]["body"]
 										)
   end
 
   def destroy
-    #
-		# duplicated from jinda_controller
-		# Expected to use in jinda)controller
-    current_ma_user = User.where(:auth_token => cookies[:auth_token]).first if cookies[:auth_token]
-
-    if Rails.env.test? #Temp solution until fix test of current_ma_user
-      current_ma_user = $xvars["current_ma_user"]
-      #current_ma_user = @article.user
-    end
+    # Use Rails 
+    # before_action
 
-    if current_ma_user.role.upcase.split(',').include?("A") || current_ma_user == @article.user
+    if current_admin? || current_ma_user == @article.user
       @article.destroy
     end
 
-    redirect_to :action=>'my'
+      action = (current_admin? ? 'index' : 'my') 
+      redirect_to :action=> (current_admin? ? 'index' : 'my') 
   end
 
   private
+  
+  def  current_admin?
+    if current_ma_user.role.upcase.split(',').include?("A") 
+      return true
+    else
+      return false
+    end
+  end
 
-  def load_edit_article
-		@article = Article.find(params.require(:article_id))
+
+  def load_articles
+    @articles = Article.desc(:created_at).page(params[:page]).per(10)
   end
-  
+
+  def load_my_articles
+    @my_articles = @articles.where(user: current_ma_user)
+  end
+
   def load_article
-		@article = Article.find(params.permit(:id))
+    @article = Article.find(params[:article_id])
+  end
+
+  def article_params
+    params[:article_id]
+  end
+
+  def load_edit_article
+    @article = Article.find(params.require(:article).permit(:article_id))
   end
 
   def load_comments

data/lib/generators/jinda/templates/app/controllers/jinda_org/comments_controller.rb

@@ -1,17 +1,19 @@
 class CommentsController < ApplicationController
 
   def create
-    # $xvars['p'] is the query parameters like params in rails guide:
-    # private
-    # def comment_params
-    #   params.require(:comment).permit(:commenter, :body)
-    # end
-    #
-    @article = Article.find($xvars['p']['comment']['article_id'])
-    @comment = @article.comments.new(
-                      body: $xvars['p']['comment']['body'],
-                      user_id: $xvars["user_id"])
+    @article = Article.find(article_params["article_id"])
+    @comment = @article.comments.new(comment_params)
     @comment.save!
+    redirect_to controller: 'articles', action: 'show', article_id: @article
   end
 
+  private
+
+  def article_params
+    params.require(:comment).permit(:article_id)
+  end
+
+  def comment_params
+    params.require(:comment).permit(:body, :article_id, :user_id)
+  end
 end

data/lib/generators/jinda/templates/app/controllers/jinda_org/docs_controller.rb

@@ -14,6 +14,7 @@ class DocsController < ApplicationController
   end
 
   def doc_update
+    # Instead of creaete, Doc record was created in form, when upload file
     
     if Jinda::Doc.where(:runseq_id => $xvars["doc_form"]["runseq_id"]).exists?
       @doc = Jinda::Doc.where(:runseq_id => $xvars["doc_form"]["runseq_id"]).first

data/lib/generators/jinda/templates/app/controllers/jinda_org/jinda_controller.rb

@@ -23,6 +23,7 @@ class JindaController < ApplicationController
       #Above line cause error update_attribute in heroku shown in logs and it was proposed to fixed in github:'kul1/g241502'
       # Main action run with :id
       redirect_to :action=>'run', :id=>xmain.id
+      
     else
       refresh_to "/", :alert => "Error: cannot process"
       error_run_xmain = "Error_run_xmain"

data/lib/generators/jinda/templates/app/controllers/jinda_org/notes_controller.rb

@@ -3,7 +3,8 @@ class NotesController < ApplicationController
   # before_action :xload_current_ma_user, only: [:destroy]
 
   def index
-    @notes = Note.desc(:created_at).page(params[:page]).per(10)
+    # @notes = Note.desc(:created_at).page(params[:page]).per(10)
+    @notes = Note
   end
 
   def my
@@ -20,8 +21,8 @@ class NotesController < ApplicationController
 
   def create
     @note = Note.new(
-      title: $xvars["new_note"]["title"],
-      body: $xvars["new_note"]["body"],
+      title: $xvars["new_note"]["note"]["title"],
+      body: $xvars["new_note"]["note"]["body"],
       user_id: $xvars["user_id"])
     @note.save!
     # if @note.save!
@@ -31,7 +32,6 @@ class NotesController < ApplicationController
     #   format.html { render :new }
     #   format.json { render json: @note.errors, status: :unprocessable_entity }
     # end
-    redirect_to @note
 
   end
 
@@ -42,10 +42,8 @@ class NotesController < ApplicationController
     # They contain everything that we get their forms select_note and edit_note
     note_id = $xvars["select_note"] ? $xvars["select_note"]["id"] : $xvars["p"]["note_id"]
     @note = Note.find(note_id)
-    @note.update(title: $xvars["edit_note"]["title"],
-                 body: $xvars["edit_note"]["body"])
-    redirect_to @note
-
+    @note.update(title: $xvars["edit_note"]["note"]["title"],
+                 body: $xvars["edit_note"]["note"]["body"])
   end
 
   def delete

data/lib/generators/jinda/templates/app/jinda/index.mm

@@ -49,7 +49,7 @@
 <node CREATED="1275788317299" ID="ID_716276608" MODIFIED="1511159716471" TEXT="link: error_logs: /jinda/error_logs"/>
 <node CREATED="1275788317299" ID="ID_1570419198" MODIFIED="1587858894833" TEXT="link: notice_logs: /jinda/notice_logs"/>
 </node>
-<node CREATED="1589756777499" ID="ID_853155456" MODIFIED="1589772589662" TEXT="docs: Document">
+<node CREATED="1589756777499" FOLDED="true" ID="ID_853155456" MODIFIED="1592785016438" TEXT="docs: Document">
 <node CREATED="1589757073388" ID="ID_1938238774" MODIFIED="1589772640862" TEXT="link: My Document: /docs/my">
 <node CREATED="1589757125861" ID="ID_521286668" MODIFIED="1589757136547" TEXT="role:m"/>
 </node>
@@ -87,11 +87,11 @@
 </node>
 </node>
 </node>
-<node CREATED="1493393619430" ID="ID_554831343" MODIFIED="1584996526651" TEXT="notes: Notes">
+<node CREATED="1493393619430" ID="ID_554831343" MODIFIED="1592926786394" TEXT="notes: Notes">
 <node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1589772615102" TEXT="link:My Notes: /notes/my">
 <node CREATED="1493490295677" ID="ID_514416082" MODIFIED="1493490302239" TEXT="role:m"/>
 </node>
-<node CREATED="1493419257021" FOLDED="true" ID="ID_553734932" MODIFIED="1589772585873" TEXT="new: New Note">
+<node CREATED="1493419257021" ID="ID_553734932" MODIFIED="1591278856955" TEXT="new: New Note">
 <node CREATED="1493419299004" ID="ID_723334321" MODIFIED="1581351169990" TEXT="new_note: New ">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479075294" ID="ID_1009521360" MODIFIED="1493479079687" TEXT="role:m"/>
@@ -99,8 +99,13 @@
 <node CREATED="1493419491125" ID="ID_1125779183" MODIFIED="1581180747700" TEXT="create: Create">
 <icon BUILTIN="bookmark"/>
 </node>
+<node CREATED="1591278861459" ID="ID_985992723" MODIFIED="1591319329198" TEXT="/notes/my">
+<arrowlink DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<linktarget COLOR="#b0b0b0" DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" SOURCE="ID_985992723" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<icon BUILTIN="forward"/>
 </node>
-<node CREATED="1493419562726" ID="ID_1241171950" MODIFIED="1581180788218" TEXT="edit: Edit">
+</node>
+<node CREATED="1493419562726" FOLDED="true" ID="ID_1241171950" MODIFIED="1591278847249" TEXT="edit: Edit">
 <node CREATED="1493419577933" ID="ID_1790163920" MODIFIED="1581350888992" TEXT="select_note: Select">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479602815" ID="ID_1289003986" MODIFIED="1493479606921" TEXT="role:m"/>
@@ -113,7 +118,7 @@
 <icon BUILTIN="bookmark"/>
 </node>
 </node>
-<node CREATED="1495246388313" ID="ID_320521408" MODIFIED="1581340759604" STYLE="fork" TEXT="delete:Delete">
+<node CREATED="1495246388313" FOLDED="true" ID="ID_320521408" MODIFIED="1591278851391" STYLE="fork" TEXT="delete:Delete">
 <edge COLOR="#808080" STYLE="bezier" WIDTH="thin"/>
 <node CREATED="1493419577933" ID="ID_1631275659" MODIFIED="1581350942681" TEXT="select_note: Select">
 <icon BUILTIN="attach"/>
@@ -123,7 +128,7 @@
 <icon BUILTIN="bookmark"/>
 </node>
 </node>
-<node CREATED="1581531446494" ID="ID_1325232876" MODIFIED="1581715693485" TEXT="mail: Mail">
+<node CREATED="1581531446494" FOLDED="true" ID="ID_1325232876" MODIFIED="1591278853597" TEXT="mail: Mail">
 <node CREATED="1493419577933" FOLDED="true" ID="ID_1817148049" MODIFIED="1581531563343" TEXT="select_note: Select">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479602815" ID="ID_1650154281" MODIFIED="1493479606921" TEXT="role:m"/>
@@ -146,23 +151,31 @@
 </node>
 </node>
 </node>
-<node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1589327646872" TEXT="articles: Article">
+<node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1592785024002" TEXT="articles: Article">
 <node CREATED="1493419096527" ID="ID_1521905276" MODIFIED="1493478060121" TEXT="link: All Articles: /articles"/>
 <node CREATED="1493489768542" FOLDED="true" ID="ID_1376361427" MODIFIED="1589757167952" TEXT="link: My article: /articles/my">
 <node CREATED="1493490295677" ID="ID_628476988" MODIFIED="1493490302239" TEXT="role:m"/>
 </node>
 <node CREATED="1493419257021" ID="ID_1355420049" MODIFIED="1588619429446" TEXT="new_article: New Article">
-<node CREATED="1588958814863" ID="ID_576640224" MODIFIED="1589053904119" TEXT="display: DisplayFile">
-<icon BUILTIN="idea"/>
-<node CREATED="1588959451085" ID="ID_779920893" MODIFIED="1588959473698" TEXT="display: Option"/>
+<node CREATED="1592785043843" ID="ID_345287367" MODIFIED="1592799450248" TEXT="condition=1">
+<icon BUILTIN="help"/>
+<node CREATED="1592786104568" ID="ID_282788674" MODIFIED="1592802765385" TEXT="redirect: &quot;next&quot;"/>
 </node>
 <node CREATED="1493419299004" ID="ID_1468250197" MODIFIED="1493419428686" TEXT="form_article: New Article">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479075294" ID="ID_1145618514" MODIFIED="1493479079687" TEXT="role:m"/>
+<node CREATED="1592785043843" ID="ID_962055360" MODIFIED="1592785146999" TEXT="match: &quot;end&quot;">
+<icon BUILTIN="help"/>
+</node>
 </node>
 <node CREATED="1493419491125" ID="ID_1687683396" MODIFIED="1493483244848" TEXT="create: Create Article">
 <icon BUILTIN="bookmark"/>
 </node>
+<node CREATED="1591278861459" ID="ID_657878492" MODIFIED="1591319807025" TEXT="/articles/my">
+<arrowlink DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<linktarget COLOR="#b0b0b0" DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" SOURCE="ID_657878492" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<icon BUILTIN="forward"/>
+</node>
 </node>
 <node CREATED="1493419562726" ID="ID_922854639" MODIFIED="1590180584955" TEXT="edit_article: Edit Article">
 <node CREATED="1493419577933" ID="ID_938626803" MODIFIED="1538329139586" TEXT="select_article: Select Article">
@@ -173,9 +186,14 @@
 <icon BUILTIN="attach"/>
 <node CREATED="1493479557266" ID="ID_1681993437" MODIFIED="1493479561055" TEXT="role:m"/>
 </node>
-<node CREATED="1493419735921" ID="ID_1575963748" MODIFIED="1493489477505" TEXT="update: Update Article">
+<node CREATED="1493419735921" ID="ID_1575963748" MODIFIED="1593286858918" TEXT="j_update: Update Article">
 <icon BUILTIN="bookmark"/>
 </node>
+<node CREATED="1591278861459" ID="ID_863187878" MODIFIED="1591319807025" TEXT="/articles/my">
+<arrowlink DESTINATION="ID_863187878" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_604727235" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<linktarget COLOR="#b0b0b0" DESTINATION="ID_863187878" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_604727235" SOURCE="ID_863187878" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<icon BUILTIN="forward"/>
+</node>
 </node>
 <node CREATED="1495246388313" ID="ID_1861034169" MODIFIED="1585001527103" TEXT="xedit_article: xEdit Article">
 <icon BUILTIN="button_cancel"/>
@@ -183,47 +201,24 @@
 <icon BUILTIN="attach"/>
 <node CREATED="1495246517185" ID="ID_1224073606" MODIFIED="1495246522964" TEXT="role:m"/>
 </node>
-<node CREATED="1495246466176" ID="ID_1635586443" MODIFIED="1495266959360" TEXT="update: Update Article">
+<node CREATED="1495246466176" ID="ID_1635586443" MODIFIED="1593286876869" TEXT="j_update: Update Article">
 <icon BUILTIN="bookmark"/>
 </node>
 </node>
-<node CREATED="1587909407412" ID="ID_1468305343" MODIFIED="1588910402612" TEXT="doc_list: Doc List">
-<node CREATED="1588958814863" ID="ID_560142027" MODIFIED="1589049756609" TEXT="display: DisplayFile">
-<icon BUILTIN="list"/>
-<node CREATED="1588959451085" ID="ID_1584950345" MODIFIED="1588959473698" TEXT="display: Option"/>
-<node CREATED="1589053886230" ID="ID_737872984" MODIFIED="1589053890706" TEXT="role: m"/>
-</node>
-</node>
-<node CREATED="1587909407412" ID="ID_1146843472" MODIFIED="1588909113502" TEXT="doc_folder: Doc Folder">
-<node CREATED="1588875666991" ID="ID_549324429" MODIFIED="1588907940839" TEXT="folder: Article Folder 1">
-<arrowlink DESTINATION="ID_549324429" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_1094355522" STARTARROW="None" STARTINCLINATION="0;0;"/>
-<linktarget COLOR="#b0b0b0" DESTINATION="ID_549324429" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_1094355522" SOURCE="ID_549324429" STARTARROW="None" STARTINCLINATION="0;0;"/>
-<icon BUILTIN="folder"/>
-</node>
-<node CREATED="1588875666991" ID="ID_650279375" MODIFIED="1588907966960" TEXT="folder_article: Article Folder2"/>
-</node>
-<node CREATED="1495246388313" ID="ID_1073115355" MODIFIED="1589635771727" TEXT="test_article: Test Article">
-<node CREATED="1589635773545" ID="ID_809041299" MODIFIED="1589655664057" TEXT="document1: display">
-<icon BUILTIN="bookmark"/>
-</node>
-<node CREATED="1495246432533" ID="ID_1329009190" MODIFIED="1589635849441" TEXT="test article: Test Article">
-<icon BUILTIN="attach"/>
-<node CREATED="1495246517185" ID="ID_724933955" MODIFIED="1495246522964" TEXT="role:m"/>
 </node>
-<node CREATED="1495246466176" ID="ID_790539896" MODIFIED="1589755604652" TEXT="update_test: Update Test Article">
-<icon BUILTIN="bookmark"/>
-</node>
-<node CREATED="1589635773545" ID="ID_1912048591" MODIFIED="1589740973954" TEXT="document2: display">
-<icon BUILTIN="bookmark"/>
-</node>
-</node>
-</node>
-<node CREATED="1493664700564" FOLDED="true" ID="ID_704959130" MODIFIED="1583091848193" TEXT="comments: Comment">
-<node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1493665186791" TEXT="new_comment: New Comment">
+<node CREATED="1493664700564" ID="ID_704959130" MODIFIED="1592950100226" TEXT="comments: Comment">
+<icon BUILTIN="button_cancel"/>
+<node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1591392666652" TEXT="new_comment: New Comment">
+<icon BUILTIN="button_cancel"/>
 <node CREATED="1493665192413" ID="ID_345629058" MODIFIED="1493665226422" TEXT="create">
 <icon BUILTIN="bookmark"/>
 <node CREATED="1493665231940" ID="ID_1645532530" MODIFIED="1493665237018" TEXT="role:m"/>
 </node>
+<node CREATED="1591278861459" ID="ID_170265872" MODIFIED="1591319807025" TEXT="/articles/my">
+<arrowlink DESTINATION="ID_170265872" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_1468117" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<linktarget COLOR="#b0b0b0" DESTINATION="ID_170265872" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_1468117" SOURCE="ID_170265872" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<icon BUILTIN="forward"/>
+</node>
 </node>
 <node CREATED="1494393494180" ID="ID_1101205873" MODIFIED="1495275996686" TEXT="role:m"/>
 </node>
@@ -253,8 +248,9 @@
 <node CREATED="1494172758253" ID="ID_961056168" MODIFIED="1494172797972" TEXT="sitemap: Sitemap"/>
 <node CREATED="1494393494180" ID="ID_242460166" MODIFIED="1494393504971" TEXT="role:a"/>
 </node>
-<node CREATED="1493393619430" ID="ID_35210833" MODIFIED="1585089057213" TEXT="api/v1/notes: Notes API ">
-<node CREATED="1493489768542" ID="ID_1053900670" MODIFIED="1582131857208" TEXT="link:My Notes: /api/v1/notes/my">
+<node CREATED="1493393619430" FOLDED="true" ID="ID_35210833" MODIFIED="1591392800862" TEXT="api/v1/notes: Notes API ">
+<node CREATED="1493489768542" ID="ID_1053900670" MODIFIED="1591074318558" TEXT="link:My Notes: /api/v1/notes/my">
+<icon BUILTIN="button_cancel"/>
 <node CREATED="1493490295677" ID="ID_1597553308" MODIFIED="1493490302239" TEXT="role:m"/>
 </node>
 <node CREATED="1493419257021" ID="ID_1182560700" MODIFIED="1581180635669" TEXT="new: New Note">
@@ -292,7 +288,7 @@
 <node CREATED="1273819855875" ID="ID_1429503284" MODIFIED="1330477311102" TEXT="a: admin"/>
 <node CREATED="1273819859775" ID="ID_568365839" MODIFIED="1330477315009" TEXT="d: developer"/>
 </node>
-<node CREATED="1273819456867" ID="ID_1677010054" MODIFIED="1493418874718" POSITION="left" TEXT="models">
+<node CREATED="1273819456867" FOLDED="true" ID="ID_1677010054" MODIFIED="1591392810437" POSITION="left" TEXT="models">
 <node CREATED="1292122118499" FOLDED="true" ID="ID_1957754752" MODIFIED="1493705885123" TEXT="person">
 <node CREATED="1292122135809" ID="ID_1617970069" MODIFIED="1332878659106" TEXT="fname"/>
 <node CREATED="1292122150362" ID="ID_1200135538" MODIFIED="1332878662388" TEXT="lname"/>