jinda 0.5.2 → 0.5.7

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, :update]
 
 	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,67 @@ 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 my_update
+    # before_action
+    @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 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

@@ -0,0 +1,56 @@
+class DocsController < ApplicationController
+  before_action :load_doc, only: [:destroy]
+  before_action :load_doc_form, only: [:doc_update, :edit, :my]
+	
+  def index
+    @documents = Jinda::Doc.desc(:created_at).page(params[:page]).per(10)
+	end
+
+  def edit
+  end
+
+  def my
+    @page_title       = 'My Document'
+  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
+      @doc.update(description: $xvars["doc_form"]["description"],
+                    category: $xvars["doc_form"]["jinda_doc"]["category"],
+                    keywords: $xvars["doc_form"]["keywords"],
+                    user_id: $xvars["user_id"]
+										)
+    else
+      # create here
+      # Todo
+    end
+  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 = @doc.user
+    end
+
+    if current_ma_user.role.upcase.split(',').include?("A") || current_ma_user == @doc.user
+      @doc.destroy
+    end
+    redirect_to :action=>'my'
+  end
+
+  private
+
+  def load_doc_form
+    @docs = Jinda::Doc.all.desc(:created_at).page(params[:page]).per(10)
+  end
+  def load_doc
+    @doc = Jinda::Doc.find(params[:doc_id])
+  end
+end

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

@@ -13,7 +13,7 @@ class JindaController < ApplicationController
       xmain = create_xmain(@service)
       result = create_runseq(xmain)
       unless result
-        message = "cannot find action for xmain #{xmain.id}"
+        message = "Node missing action icon: cannot find action for xmain #{xmain.id}, the node required action(icon) in freemind eg: form, list, method"
         ma_log(message)
         flash[:notice]= message
         redirect_to "pending" and return
@@ -21,9 +21,13 @@ class JindaController < ApplicationController
       xmain.update_attribute(:xvars, @xvars)
       xmain.runseqs.last.update_attribute(:end,true)
       #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"
+      ma_log(error_run_xmain)
     end
   end
 
@@ -32,6 +36,24 @@ class JindaController < ApplicationController
   # action from @r.action == do, form, if, output
   # Then will call def run_do, run_form, run_if, run_output
   ########################################################################]
+  # 
+  # run 
+  #   init_vars 
+  #   To get all var from global and runseq, action
+  #     (@runseq.action)
+  # 
+  #   run_do, run_form, run_if, run_output
+  #     run_do => controller => action eg: update, create, document
+  #     run_form => 
+  #       run_form.haml => - next step => def end_form
+  #       - next_step = end_form
+  #     run_if =>
+  #     run_output =>
+  #
+  #   end_action
+  #   => save local var to database :current_runseq
+  #   :current_runseq => next_runseq 
+  #
   def run
     init_vars(params[:id])
     if authorize?
@@ -41,5 +63,4 @@ class JindaController < ApplicationController
       redirect_to_root
     end
   end
-
 end

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

@@ -1,7 +1,7 @@
 <map version="1.0.1">
 <!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
 <node CREATED="1273819432637" ID="ID_1098419600" MODIFIED="1334737006485" TEXT="Jinda">
-<node CREATED="1273819462973" ID="ID_282419531" MODIFIED="1583088810861" POSITION="right" TEXT="services">
+<node CREATED="1273819462973" ID="ID_282419531" MODIFIED="1589756758387" POSITION="right" TEXT="services">
 <node CREATED="1275756501221" FOLDED="true" ID="ID_1720745721" MODIFIED="1583097151076" TEXT="users:User">
 <node CREATED="1278491598711" ID="ID_1662699954" MODIFIED="1494393920347" TEXT="role:m"/>
 <node CREATED="1279700865182" ID="ID_1266797279" MODIFIED="1357798847781" TEXT="link:info: /users"/>
@@ -25,7 +25,7 @@
 </node>
 </node>
 </node>
-<node CREATED="1275752678377" FOLDED="true" ID="ID_1348489452" MODIFIED="1583097147577" TEXT="admins:Admin">
+<node CREATED="1275752678377" ID="ID_1348489452" MODIFIED="1588883079396" TEXT="admins:Admin">
 <node CREATED="1275752688167" ID="ID_229996461" MODIFIED="1275752690948" TEXT="role:a"/>
 <node CREATED="1282722836614" ID="ID_1213363124" MODIFIED="1330477902602" TEXT="edit_role:edit user role">
 <node CREATED="1282722862918" ID="ID_1190117882" MODIFIED="1330477922159" TEXT="select_user:select user">
@@ -44,15 +44,54 @@
 <node CREATED="1275790679363" ID="ID_829325467" MODIFIED="1511159696044" TEXT="link: logs: /jinda/logs"/>
 <node CREATED="1507573166973" ID="ID_351025910" MODIFIED="1511159700908" TEXT="link: docs: /jinda/doc"/>
 </node>
-<node CREATED="1273706796854" FOLDED="true" ID="ID_1003882979" MODIFIED="1583097155227" TEXT="devs: Developer">
+<node CREATED="1273706796854" ID="ID_1003882979" MODIFIED="1588964401951" TEXT="devs: Developer">
 <node CREATED="1275373154914" ID="ID_340725299" MODIFIED="1275373158632" TEXT="role:d"/>
 <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="1493393619430" ID="ID_554831343" MODIFIED="1584996526651" TEXT="notes: Notes">
-<node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1581383331288" TEXT="link:My Notes: /notes/my">
+<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>
+<node CREATED="1589756879955" ID="ID_899042293" MODIFIED="1589910229085" TEXT="doc_new: New Document">
+<node CREATED="1589756946117" ID="ID_1840278804" MODIFIED="1589910235469" TEXT="doc_form: Doc Form">
+<icon BUILTIN="attach"/>
+<node CREATED="1589757054618" ID="ID_642998203" MODIFIED="1589757059003" TEXT="role: m"/>
+</node>
+<node CREATED="1589757264764" ID="ID_1352102524" MODIFIED="1589772413612" TEXT="doc_update: Doc update">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1493419562726" ID="ID_339628868" MODIFIED="1590424956484" TEXT="doc_edit: Edit Document">
+<icon BUILTIN="button_cancel"/>
+<node CREATED="1493419577933" ID="ID_801950372" MODIFIED="1590180699851" TEXT="doc_select: Select Document">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479602815" ID="ID_761787946" MODIFIED="1493479606921" TEXT="role:m"/>
+</node>
+<node CREATED="1493419612720" ID="ID_1190499756" MODIFIED="1590180735204" TEXT="doc_edit: Edit Document">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479557266" ID="ID_1216426484" MODIFIED="1493479561055" TEXT="role:m"/>
+</node>
+<node CREATED="1581400438157" ID="ID_447781815" MODIFIED="1590180242343" TEXT="doc_update: Doc_update">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1495246388313" ID="ID_278169779" MODIFIED="1590180135106" TEXT="doc_xedit: Doc_hidden_menu">
+<icon BUILTIN="button_cancel"/>
+<node CREATED="1493419612720" ID="ID_541432768" MODIFIED="1590180160498" TEXT="doc_edit: Edit">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479557266" ID="ID_1339913531" MODIFIED="1493479561055" TEXT="role:m"/>
+</node>
+<node CREATED="1581400438157" ID="ID_802199910" MODIFIED="1590180242343" TEXT="doc_update: Doc_update">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+</node>
+<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" ID="ID_553734932" MODIFIED="1581180635669" 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"/>
@@ -60,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>
-<node CREATED="1493419562726" ID="ID_1241171950" MODIFIED="1581180788218" TEXT="edit: Edit">
+<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"/>
@@ -74,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"/>
@@ -84,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"/>
@@ -96,7 +140,7 @@
 <icon BUILTIN="bookmark"/>
 </node>
 </node>
-<node CREATED="1495246388313" ID="ID_807216843" MODIFIED="1585001129104" TEXT="xedit: Future use">
+<node CREATED="1495246388313" FOLDED="true" ID="ID_807216843" MODIFIED="1590180066630" TEXT="xedit: Future use">
 <icon BUILTIN="button_cancel"/>
 <node CREATED="1493419612720" ID="ID_6864095" MODIFIED="1584999031935" TEXT="edit_note: Edit">
 <icon BUILTIN="attach"/>
@@ -107,21 +151,33 @@
 </node>
 </node>
 </node>
-<node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1585001518753" 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" ID="ID_1376361427" MODIFIED="1493768994418" TEXT="link: My article: /articles/my">
+<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="1493489729876" TEXT="new_article: New Article">
+<node CREATED="1493419257021" ID="ID_1355420049" MODIFIED="1588619429446" TEXT="new_article: New Article">
+<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 CREATED="1493419562726" ID="ID_922854639" MODIFIED="1493490306480" TEXT="edit_article: Edit Article">
+</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">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479602815" ID="ID_753056881" MODIFIED="1493479606921" TEXT="role:m"/>
@@ -130,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"/>
@@ -140,17 +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>
-<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>
@@ -180,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">
@@ -194,10 +263,6 @@
 </node>
 </node>
 <node CREATED="1493419562726" ID="ID_963001770" MODIFIED="1581180788218" TEXT="edit: Edit">
-<node CREATED="1493419577933" ID="ID_1640736660" MODIFIED="1581350888992" TEXT="select_note: Select">
-<icon BUILTIN="attach"/>
-<node CREATED="1493479602815" ID="ID_1623444138" MODIFIED="1493479606921" TEXT="role:m"/>
-</node>
 <node CREATED="1493419612720" ID="ID_1362613316" MODIFIED="1581350996674" TEXT="edit_note: Edit">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479557266" ID="ID_1838104057" MODIFIED="1493479561055" TEXT="role:m"/>
@@ -223,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"/>