Update Ldap.php

[bookstack] / resources / assets / js / controllers.js

diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js
index f098e01306a9950ee2dd194cc3f2ef2677d451bd..9d7f7ad706d1037eef8beee41c075a6ce1fc0b45 100644 (file)
--- a/resources/assets/js/controllers.js
+++ b/resources/assets/js/controllers.js
@@ -1,8 +1,10 @@
 "use strict";
 
-const moment = require('moment');
+import moment from 'moment';
+import 'moment/locale/en-gb';
+moment.locale('en-gb');
 
-module.exports = function (ngApp, events) {
+export default function (ngApp, events) {
 
     ngApp.controller('ImageManagerController', ['$scope', '$attrs', '$http', '$timeout', 'imageManagerService',
         function ($scope, $attrs, $http, $timeout, imageManagerService) {
@@ -17,7 +19,7 @@ module.exports = function (ngApp, events) {
             $scope.imageDeleteSuccess = false;
             $scope.uploadedTo = $attrs.uploadedTo;
             $scope.view = 'all';
-            
+
             $scope.searching = false;
             $scope.searchTerm = '';
 
@@ -48,7 +50,7 @@ module.exports = function (ngApp, events) {
                 $scope.hasMore = preSearchHasMore;
             }
             $scope.cancelSearch = cancelSearch;
-            
+
 
             /**
              * Runs on image upload, Adds an image to local list of images
@@ -162,7 +164,6 @@ module.exports = function (ngApp, events) {
 
             /**
              * Start a search operation
-             * @param searchTerm
              */
             $scope.searchImages = function() {
 
@@ -196,7 +197,7 @@ module.exports = function (ngApp, events) {
                 $scope.view = viewName;
                 baseUrl = window.baseUrl('/images/' + $scope.imageType  + '/' + viewName + '/');
                 fetchData();
-            }
+            };
 
             /**
              * Save the details of an image.
@@ -205,7 +206,7 @@ module.exports = function (ngApp, events) {
             $scope.saveImageDetails = function (event) {
                 event.preventDefault();
                 var url = window.baseUrl('/images/update/' + $scope.selectedImage.id);
-                $http.put(url, this.selectedImage).then((response) => {
+                $http.put(url, this.selectedImage).then(response => {
                     events.emit('success', 'Image details updated');
                 }, (response) => {
                     if (response.status === 422) {
@@ -304,12 +305,12 @@ module.exports = function (ngApp, events) {
         $scope.isUpdateDraft = Number($attrs.pageUpdateDraft) === 1;
         $scope.isNewPageDraft = Number($attrs.pageNewDraft) === 1;
 
-        // Set inital header draft text
+        // Set initial header draft text
         if ($scope.isUpdateDraft || $scope.isNewPageDraft) {
             $scope.draftText = 'Editing Draft'
         } else {
             $scope.draftText = 'Editing Page'
-        };
+        }
 
         var autoSave = false;
 
@@ -437,7 +438,7 @@ module.exports = function (ngApp, events) {
 
             const pageId = Number($attrs.pageId);
             $scope.tags = [];
-            
+
             $scope.sortOptions = {
                 handle: '.handle',
                 items: '> tr',
@@ -538,6 +539,10 @@ module.exports = function (ngApp, events) {
             $scope.files = [];
             $scope.editFile = false;
             $scope.file = getCleanFile();
+            $scope.errors = {
+                link: {},
+                edit: {}
+            };
 
             function getCleanFile() {
                 return {
@@ -565,9 +570,9 @@ module.exports = function (ngApp, events) {
                 if (newOrder === currentOrder) return;
 
                 currentOrder = newOrder;
-                $http.put(`/files/sort/page/${pageId}`, {files: $scope.files}).then(resp => {
+                $http.put(window.baseUrl(`/attachments/sort/page/${pageId}`), {files: $scope.files}).then(resp => {
                     events.emit('success', resp.data.message);
-                }, checkError);
+                }, checkError('sort'));
             }
 
             /**
@@ -576,18 +581,18 @@ module.exports = function (ngApp, events) {
              */
             $scope.getUploadUrl = function (file) {
                 let suffix = (typeof file !== 'undefined') ? `/${file.id}` : '';
-                return window.baseUrl(`/files/upload${suffix}`);
+                return window.baseUrl(`/attachments/upload${suffix}`);
             };
 
             /**
              * Get files for the current page from the server.
              */
             function getFiles() {
-                let url = window.baseUrl(`/files/get/page/${pageId}`)
+                let url = window.baseUrl(`/attachments/get/page/${pageId}`)
                 $http.get(url).then(resp => {
                     $scope.files = resp.data;
                     currentOrder = resp.data.map(file => {return file.id}).join(':');
-                }, checkError);
+                }, checkError('get'));
             }
             getFiles();
 
@@ -599,7 +604,7 @@ module.exports = function (ngApp, events) {
              */
             $scope.uploadSuccess = function (file, data) {
                 $scope.$apply(() => {
-                    $scope.files.unshift(data);
+                    $scope.files.push(data);
                 });
                 events.emit('success', 'File uploaded');
             };
@@ -612,10 +617,10 @@ module.exports = function (ngApp, events) {
             $scope.uploadSuccessUpdate = function (file, data) {
                 $scope.$apply(() => {
                     let search = filesIndexOf(data);
-                    if (search !== -1) $scope.files[search] = file;
+                    if (search !== -1) $scope.files[search] = data;
 
                     if ($scope.editFile) {
-                        $scope.editFile = data;
+                        $scope.editFile = angular.copy(data);
                         data.link = '';
                     }
                 });
@@ -627,33 +632,36 @@ module.exports = function (ngApp, events) {
              * @param file
              */
             $scope.deleteFile = function(file) {
-                  $http.delete(`/files/${file.id}`).then(resp => {
+                if (!file.deleting) {
+                    file.deleting = true;
+                    return;
+                }
+                  $http.delete(window.baseUrl(`/attachments/${file.id}`)).then(resp => {
                       events.emit('success', resp.data.message);
                       $scope.files.splice($scope.files.indexOf(file), 1);
-                  }, checkError);
+                  }, checkError('delete'));
             };
 
             /**
              * Attach a link to a page.
-             * @param fileName
-             * @param fileLink
+             * @param file
              */
             $scope.attachLinkSubmit = function(file) {
                 file.uploaded_to = pageId;
-                $http.post('/files/link', file).then(resp => {
-                    $scope.files.unshift(resp.data);
+                $http.post(window.baseUrl('/attachments/link'), file).then(resp => {
+                    $scope.files.push(resp.data);
                     events.emit('success', 'Link attached');
                     $scope.file = getCleanFile();
-                }, checkError);
+                }, checkError('link'));
             };
 
             /**
              * Start the edit mode for a file.
-             * @param fileId
+             * @param file
              */
             $scope.startEdit = function(file) {
                 $scope.editFile = angular.copy(file);
-                if (!file.external) $scope.editFile.link = '';
+                $scope.editFile.link = (file.external) ? file.path : '';
             };
 
             /**
@@ -668,16 +676,23 @@ module.exports = function (ngApp, events) {
              * @param file
              */
             $scope.updateFile = function(file) {
-                $http.put(`/files/${file.id}`, file).then(resp => {
+                $http.put(window.baseUrl(`/attachments/${file.id}`), file).then(resp => {
                     let search = filesIndexOf(resp.data);
-                    if (search !== -1) $scope.files[search] = file;
+                    if (search !== -1) $scope.files[search] = resp.data;
 
                     if ($scope.editFile && !file.external) {
                         $scope.editFile.link = '';
                     }
                     $scope.editFile = false;
                     events.emit('success', 'Attachment details updated');
-                });
+                }, checkError('edit'));
+            };
+
+            /**
+             * Get the url of a file.
+             */
+            $scope.getFileUrl = function(file) {
+                return window.baseUrl('/attachments/' + file.id);
             };
 
             /**
@@ -695,31 +710,21 @@ module.exports = function (ngApp, events) {
 
             /**
              * Check for an error response in a ajax request.
-             * @param response
+             * @param errorGroupName
              */
-            function checkError(response) {
-                if (typeof response.data !== 'undefined' && typeof response.data.error !== 'undefined') {
-                    events.emit('error', response.data.error);
+            function checkError(errorGroupName) {
+                $scope.errors[errorGroupName] = {};
+                return function(response) {
+                    if (typeof response.data !== 'undefined' && typeof response.data.error !== 'undefined') {
+                        events.emit('error', response.data.error);
+                    }
+                    if (typeof response.data !== 'undefined' && typeof response.data.validation !== 'undefined') {
+                        $scope.errors[errorGroupName] = response.data.validation;
+                        console.log($scope.errors[errorGroupName])
+                    }
                 }
             }
 
         }]);
 
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-