From 98fa89bd809044eb13da85a198fe9d62041cef5c Mon Sep 17 00:00:00 2001
From: Benjamin Gamard <b.gamard@sismics.com>
Date: Wed, 28 Nov 2018 13:09:20 +0100
Subject: [PATCH 1/2] css fix

(cherry picked from commit 33aaf8afd28c73ca4f72dd57da301ac296d3e3f1)
---
 .../java/com/sismics/docs/rest/resource/FileResource.java     | 2 +-
 docs-web/src/main/webapp/src/style/main.less                  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java
index 4f03f156..ea6dbfcb 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java
@@ -288,7 +288,7 @@ public class FileResource extends BaseResource {
         DocumentDao documentDao = new DocumentDao();
         FileDao fileDao = new FileDao();
         File file = fileDao.getFile(id);
-        if (file == null) {
+        if (file == null || file.getDocumentId() == null) {
             throw new NotFoundException();
         }
         DocumentDto documentDto = documentDao.getDocument(file.getDocumentId(), PermType.WRITE, getTargetIdList(null));
diff --git a/docs-web/src/main/webapp/src/style/main.less b/docs-web/src/main/webapp/src/style/main.less
index 4998f80a..a9c13ce5 100644
--- a/docs-web/src/main/webapp/src/style/main.less
+++ b/docs-web/src/main/webapp/src/style/main.less
@@ -653,6 +653,10 @@ input[readonly].share-link {
   }
 }
 
+.navbar-brand {
+  font-weight: 500;
+}
+
 .nav > li {
   font-weight: 500;
 }

From 5169deb005b1324af9e44d729a920d37bf993ef6 Mon Sep 17 00:00:00 2001
From: Benjamin Gamard <b.gamard@sismics.com>
Date: Wed, 5 Dec 2018 17:23:19 +0100
Subject: [PATCH 2/2] fix workflow form

(cherry picked from commit db4f5f9011c5222f665b4caecccb99474f2a5d58)
---
 .../settings/SettingsWorkflowEdit.js          |  1 +
 .../partial/docs/settings.workflow.edit.html  | 22 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsWorkflowEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsWorkflowEdit.js
index a4a4dfa1..444b1e12 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsWorkflowEdit.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsWorkflowEdit.js
@@ -1,3 +1,4 @@
+
 'use strict';
 
 /**
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.workflow.edit.html b/docs-web/src/main/webapp/src/partial/docs/settings.workflow.edit.html
index 1cc03eca..e3efd853 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.workflow.edit.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.workflow.edit.html
@@ -136,20 +136,10 @@
       </div>
     </div>
 
-    <div class="panel panel-default mt-30" ng-show="isEdit()">
-      <div class="panel-body">
-        <p translate="settings.workflow.edit.acl_info"></p>
-        <acl-edit source="workflow.id"
-                  acls="workflow.acls"
-                  writable="workflow.writable"
-                  creator="workflow.creator"></acl-edit>
-      </div>
-    </div>
-
     <div class="clearfix form-group mt-10">
       <div class="col-sm-offset-2 col-sm-10">
         <button type="submit" class="btn btn-primary" ng-click="edit()" ng-disabled="!editWorkflowForm.$valid">
-          <span class="fas fa-pencil-alt"></span> {{ isEdit() ? 'save' : 'add' | translate }}
+          <span class="fas fa-pencil-alt"></span> {{ 'save' | translate }}
         </button>
         <button type="button" class="btn btn-danger" ng-click="remove()" ng-show="isEdit()">
           <span class="fas fa-trash"></span> {{ 'delete' | translate }}
@@ -157,4 +147,14 @@
       </div>
     </div>
   </form>
+
+  <div class="panel panel-default mt-30" ng-show="isEdit()">
+    <div class="panel-body">
+      <p translate="settings.workflow.edit.acl_info"></p>
+      <acl-edit source="workflow.id"
+                acls="workflow.acls"
+                writable="workflow.writable"
+                creator="workflow.creator"></acl-edit>
+    </div>
+  </div>
 </div>
\ No newline at end of file