From 51ecf3afebf59dbd4d28733d6347e0cb2298e7a9 Mon Sep 17 00:00:00 2001
From: Andrey Panov <gensurkin@yandex.ru>
Date: Thu, 7 Nov 2019 17:23:29 +0300
Subject: [PATCH] java: blockcontent mode

---
 .../java/src/main/java/entities/FileModel.java    |   8 +++++---
 .../src/main/webapp/css/img/block-content-24.png  | Bin 0 -> 452 bytes
 .../java/src/main/webapp/index.jsp                |  11 +++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 web/documentserver-example/java/src/main/webapp/css/img/block-content-24.png

diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java
index 764f9509..683a40e5 100644
--- a/web/documentserver-example/java/src/main/java/entities/FileModel.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java
@@ -210,15 +210,17 @@ public class FileModel
         public Boolean edit;
         public Boolean fillForms;
         public Boolean modifyFilter;
+        public Boolean modifyContentControl;
         public Boolean review;
 
         public Permissions(String mode, String type, Boolean canEdit)
         {
-            comment = !mode.equals("view") && !mode.equals("fillForms") && !mode.equals("embedded");
+            comment = !mode.equals("view") && !mode.equals("fillForms") && !mode.equals("embedded") && !mode.equals("blockcontent");
             download = true;
-            edit = canEdit && (mode.equals("edit") || mode.equals("filter"));
-            fillForms = !mode.equals("view") && !mode.equals("comment") && !mode.equals("embedded");
+            edit = canEdit && (mode.equals("edit") || mode.equals("filter") || mode.equals("blockcontent"));
+            fillForms = !mode.equals("view") && !mode.equals("comment") && !mode.equals("embedded") && !mode.equals("blockcontent");
             modifyFilter = !mode.equals("filter");
+            modifyContentControl = !mode.equals("blockcontent");
             review = mode.equals("edit") || mode.equals("review");
         }
     }
diff --git a/web/documentserver-example/java/src/main/webapp/css/img/block-content-24.png b/web/documentserver-example/java/src/main/webapp/css/img/block-content-24.png
new file mode 100644
index 0000000000000000000000000000000000000000..44e624ba49ab80960b79d79176a1d8725ac21fe0
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0a-~zK~#7F?NmE%
zgFqBqK9XBfrXvj;BTC7qASZ}(0w-O%I46j6g5WYeP{TPWLT*3-NC6=-O8_k^TliC&
zk<jq=vG2|72SR4dI2Qsr6P9ItgH$|;@B24=UM45NG|gAaMNxco#YxY$ZLgZ9QPJ#~
z#z#AV;&;$f7p8a=COyPx@)iWaT4pRx!G)?v@DDSlaNi8ED2o4lU~wV{!j>|cY&xYw
zW2mK#x6D|YW!a{k2M0|zadNqKxb0o_c^CA+<P(`I(6BMxEUY8DBr2DWxHyDUwt+fo
zaDa=1ZGvLA)CCuhz884a`+&)Jp67**<0w^C(WUA))UE3}k|c>1Uv^_D#9q-Cu~Rh(
z*l(?uWw|2b)3ZeJPo_A9Vi-nyl;vHwZ^{hwzV{x$u}WDYM<R~nP}g;8{|n;oHBDRh
uxjfIW7mLL&ibu%3@M=!N)W2xP1>g^JEQG2779o590000<MNUMnLSTZ-rnyM~

literal 0
HcmV?d00001

diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp
index 9e3f401f..128d3fe7 100644
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@@ -139,7 +139,7 @@
                             <thead>
                                 <tr class="tableHeader">
                                     <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
-                                    <td colspan="5" class="tableHeaderCell contentCells-shift">Editors</td>
+                                    <td colspan="6" class="tableHeaderCell contentCells-shift">Editors</td>
                                     <td colspan="3" class="tableHeaderCell">Viewers</td>
                                 </tr>
                             </thead>
@@ -185,13 +185,20 @@
                                                 <img src="css/img/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment"/>
                                             </a>
                                         </td>
-                                        <td class="contentCells contentCells-shift contentCells-icon">
+                                        <td class="contentCells contentCells-icon">
                                             <% if (docType.equals("text")) { %>
                                                 <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=fillForms" target="_blank">
                                                     <img src="css/img/fill-forms-24.png" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                 </a>
                                             <% } %>
                                         </td>
+                                        <td class="contentCells contentCells-shift contentCells-icon">
+                                            <% if (docType.equals("text")) { %>
+                                                <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=blockcontent" target="_blank">
+                                                    <img src="css/img/block-content-24.png" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
+                                                </a>
+                                            <% } %>
+                                        </td>
 
                                         <td class="contentCells contentCells-icon">
                                             <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=view" target="_blank">