From fc1897413a5142e53ddd71944e6acd08dd183869 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 25 Feb 2017 14:33:42 +0000
Subject: [PATCH] Loeschen implementiert
---
web/ui/index.html | 47 +++++++++++++--
src/java/de/uhilger/filecms/api/FileMgr.java | 27 ++++++++
web/ui/ui.js | 52 ++++++++++++++++
3 files changed, 116 insertions(+), 10 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index d70f816..78ac92d 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -20,13 +20,13 @@
import de.uhilger.filecms.web.Initialiser;
import de.uhilger.filesystem.FileRef;
+import de.uhilger.filesystem.FileSystem;
import de.uhilger.filesystem.LocalFileSystem;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.StringReader;
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
@@ -122,6 +122,31 @@
return code;
}
+ public String deleteFiles(String relPath, List fileNames) {
+ String result = null;
+ try {
+ FileRef[] delRefs = new FileRef[fileNames.size()];
+ logger.fine(fileNames.toString());
+ File targetDir = getTargetDir(relPath);
+ for(int i=0; i < fileNames.size(); i++) {
+ Object o = fileNames.get(i);
+ if(o instanceof ArrayList) {
+ ArrayList al = (ArrayList) o;
+ logger.fine(al.get(0).toString());
+ File targetFile = new File(targetDir, al.get(0).toString());
+ logger.fine(targetFile.getAbsolutePath());
+ delRefs[i] = new FileRef(targetFile.getAbsolutePath(), targetFile.isDirectory());
+ }
+ }
+ FileSystem fs = new LocalFileSystem();
+ fs.delete(delRefs);
+ result = "deleted";
+ } catch (Throwable ex) {
+ logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+ }
+ return result;
+ }
+
public FileRef saveTextFile(String relPath, String fileName, String contents) {
FileRef savedFile = null;
try {
diff --git a/web/ui/index.html b/web/ui/index.html
index 28455a6..ff31437 100644
--- a/web/ui/index.html
+++ b/web/ui/index.html
@@ -63,22 +63,32 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Datei</a>
<div class="dropdown-menu">
- <a id="newTextFile" class="dropdown-item" href="#">Neue Text-Datei..</a>
+ <a id="newTextFile" class="dropdown-item" href="#">Neuer Text..</a>
<a class="dropdown-item disabled" href="#">Neues Dokument..</a>
<a id="newFolder" class="dropdown-item" href="#">Neuer Ordner..</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item disabled" href="#">Ansehen als Code</a>
- <a class="dropdown-item disabled" href="#">Ansehen als Dokument</a>
+ <a id="editTextFile" class="dropdown-item" href="#">Öffnen als Text</a>
+ <a class="dropdown-item disabled" href="#">Öffnen als Dokument</a>
<div class="dropdown-divider"></div>
- <a id="editTextFile" class="dropdown-item" href="#">Bearbeiten als Code</a>
- <a class="dropdown-item disabled" href="#">Bearbeiten als Dokument</a>
+ <a class="dropdown-item disabled" href="#">Ansehen als Text</a>
+ <a class="dropdown-item disabled" href="#">Ansehen als Dokument</a>
<div class="dropdown-divider"></div>
<a id="saveFile" class="dropdown-item" href="#">Speichern</a>
<a id="saveFileAs" class="dropdown-item" href="#">Speichern unter..</a>
<div class="dropdown-divider"></div>
- <a id="closeFile" class="dropdown-item" href="#">Schliessen</a>
+ <a id="renameFile" class="dropdown-item" href="#">Umbenennen..</a>
<div class="dropdown-divider"></div>
- <a id="m-test" class="dropdown-item" href="#">Test</a>
+ <a id="closeFile" class="dropdown-item" href="#">Schliessen</a>
+ </div>
+ </li>
+ <li class="nav-item dropdown">
+ <a id="editMenu" class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Bearbeiten</a>
+ <div class="dropdown-menu">
+ <a id="m-cut" class="dropdown-item" href="#">Ausschneiden</a>
+ <a id="m-copy" class="dropdown-item" href="#">Kopieren</a>
+ <a id="m-paste" class="dropdown-item" href="#">Einfügen</a>
+ <div class="dropdown-divider"></div>
+ <a id="m-del" class="dropdown-item" href="#">Löschen</a>
</div>
</li>
<li class="nav-item dropdown">
@@ -89,6 +99,8 @@
<a class="dropdown-item" href="/wbx/mng">Apps verwalten</a>
<a class="dropdown-item" href="/um/ui">Benutzer verwalten</a>
<a class="dropdown-item disabled" href="/file-cms/ui">Dateien verwalten</a>
+ <div class="dropdown-divider"></div>
+ <a id="m-test" class="dropdown-item" href="#">Test</a>
<div class="dropdown-divider"></div>
<a id="logout" class="dropdown-item" href="#">Abmelden</a>
</div>
@@ -154,6 +166,27 @@
</div>
</div>
</div> <!-- Modal Ende -->
+ <!-- Modal ok / cancel Start -->
+ <div class="modal fade" id="confirmModal">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title">Löschen</h5>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ </div>
+ <div class="modal-body">
+ <p>Wirklich ...?</p>
+ </div>
+ <div class="modal-footer">
+ <button id="confirmOk" type="button" class="btn btn-danger" data-dismiss="modal">Löschen</button>
+ <button id="confirmCancel" type="button" class="btn btn-secondary" data-dismiss="modal">Abbrechen</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Modal ok / cancel Ende -->
</div>
<!-- Fusszeile -->
<!--
diff --git a/web/ui/ui.js b/web/ui/ui.js
index 6078a9c..b4e6872 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -31,6 +31,7 @@
$('#saveFile').on('click', fm_menu_datei_speichern);
$('#saveFileAs').on('click', fm_menu_datei_speichern_unter);
$('#closeFile').on('click', fm_menu_datei_schliessen);
+ $('#m-del').on('click', fm_menu_delete);
$('#m-test').on('click', fm_menu_test);
$('#saveModal').on('hidden.bs.modal', function (e) {
$('#modal_ok').attr('onclick','').unbind('click');
@@ -82,9 +83,29 @@
/* ----- Uploader Ende --------------- */
+function fm_menu_delete() {
+ $('#confirmOk').click(function() {
+ // hier loeschen
+ fm_del_files();
+ });
+ $('.modal-title').text("Löschen");
+ $('.modal-body').text("Wirklich löschen?");
+
+ /*var fname = $('.datei-gewaehlt').text();
+ if(fname !== undefined) {
+ $('#dateiname').val(fname);
+ } else {
+ $('#dateiname').val('');
+ }*/
+ //$('#dateiname').attr('placeholder', 'Dateiname');
+ $('#confirmModal').modal({
+ keyboard: false,
+ show: true
+ });
+}
+
function fm_menu_test() {
var w = $('.ost').width();
- console.log('.ost.width: ' + w);
if(w == 0) {
$('.ost').width('20%');
$('.ost').text('Hallo Welt!');
@@ -225,7 +246,8 @@
}
function fm_get_file_content() {
- var fname = $('.datei-gewaehlt').text();
+ var gewaehlte = $('.datei-gewaehlt');
+ var fname = $(gewaehlte[1]).text();
openFileName = fname;
var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + pfad + '&p=' + fname;
var u = '../svc' + m;
@@ -235,6 +257,32 @@
}
+function fm_del_files() {
+ var gewaehlte = $('.datei-gewaehlt');
+ //console.log('anzahl: ' + gewaehlte.length);
+ var fnames = new Array();
+ var i = 1;
+ while(i < gewaehlte.length) {
+ var str = { "java.lang.String": $(gewaehlte[i]).text()};
+ fnames.push(str);
+ //console.log('loeschen ' + pfad + ' ' + $(gewaehlte[i]).text());
+ i += 2;
+ }
+
+ var liste = '{"List":' + JSON.stringify(fnames) + '}';
+ // 'liste' enthaelt:
+ // {"List":[{"java.lang.String":"test3.txt"},{"java.lang.String":"Test1.txt"},{"java.lang.String":"Test2.txt"}]}
+ // und wird auf dem Server zu einer List[ArrayList<String>]
+
+ var m = '?c=de.uhilger.filecms.api.FileMgr&m=deleteFiles&p=' + pfad + '&p=' + encodeURIComponent(liste);
+ var u = '../svc' + m;
+ fm_get(u, "text", function(resp) {
+ // console.log('deleteFiles gab folgendes zurueck: ' + resp);
+ fm_get_list(pfad);
+ });
+
+}
+
function fm_render_list(fl) {
if(modus == 'kacheln') {
// Kachelansicht
--
Gitblit v1.9.3