Skip to content

Commit

Permalink
No renmae for /wiki
Browse files Browse the repository at this point in the history
  • Loading branch information
root authored and root committed Jun 1, 2013
1 parent b079634 commit d6d5295
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 15 deletions.
4 changes: 3 additions & 1 deletion ajax/wikiVersions.php
View file
Expand Up @@ -21,7 +21,8 @@
*/
error_reporting (E_ALL | E_STRICT);
ini_set ('display_errors', 'On');
if(!defined('')) define('DOKU_CHANGE_TYPE_MOVE','M');
if(!defined('DOKU_CHANGE_TYPE_MOVE')) define('DOKU_CHANGE_TYPE_MOVE','M');
if(!defined('DOKU_CHANGE_TYPE_REPLACE')) define('DOKU_CHANGE_TYPE_REPLACE','R');

OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
Expand All @@ -47,6 +48,7 @@
OCP\JSON::error(array("data" => array( "message" => "No versions")));
return '';
}
$meta = array_reverse($meta);
$ret = '<ul>';
for($i = 1; $i < $lines; $i++){
$line = explode("\t", $meta[$i]);
Expand Down
14 changes: 11 additions & 3 deletions js/wiki.js
View file
Expand Up @@ -180,7 +180,7 @@ Wiki={
data: {/*fileid: fileid*/file: encodeURIComponent(file).replace( /%2F/g, ':' ), desc: $('#filedesc').val()},
async: true,
success: function(result){
OC.Notification.show(t('dokuwiki','Update Description for {file}',{file: file}));
OC.Notification.show(t('dokuwiki','Update description for {file}',{file: file}));
}
});
Wiki.$popup.dialog("destroy");
Expand Down Expand Up @@ -215,7 +215,7 @@ Wiki={
var mmurl = Wiki.dokuwikiurl + '/doku.php' + '?ns=' + encodeURIComponent(dir).replace( /\//g, ':' ).replace( /%2F/g, ':' ).substring(Wiki.wiki.length+1)+'&image='+ wikiid + '&do=media&tab_details=history';
var html = '<div id="dropdown" class="drop drop-wiki" data-file="'+escapeHTML(file)+'">';
html += '<div id="private" style="margin-bottom: 5px;">';
html += '<button name="makelink" id="dokuwikidetail"> <img src="'+OC.imagePath('core','actions/search')+'" style="vertical-align:middle"> '+t('dokuwiki', 'details')+'</button>';
html += '<button name="makelink" id="dokuwikidetail"> <img src="'+OC.imagePath('core','actions/search')+'" style="vertical-align:middle"> '+t('dokuwiki', 'Details')+'</button>';
//html += '<input type="button" value="Detailseite" name="makelink" id="dokuwikidetail" />';
html += '<button name="makelink" id="dokuwikimediamanager"> <img src="'+OC.imagePath('core','actions/info')+'" style="vertical-align:middle"> '+t('dokuwiki', 'Mediamanager')+'</button>';
//html += '<input type="button" value="Mediamanager" name="makelink" id="dokuwikimediamanager" style="margin-left: 5px;"/>';
Expand Down Expand Up @@ -423,7 +423,7 @@ Wiki={
// Textfield for description
$p = jQuery(document.createElement('p'));
$p.css('padding-top','5px');
$p.html('<label>'+t('dokuwiki','Image/file title')+'</label>' +
$p.html('<label>'+t('dokuwiki','Title')+'</label>' +
'<textarea name="desc" id="desc" rows="2" style="overflow:hidden;width:90%;"></textarea>');
//$p.html('<label>Description: </label>' +
//'<input type="text" name="desc" id="desc" value="" >');
Expand Down Expand Up @@ -1064,6 +1064,14 @@ $(document).ready(function(){
$('#notification:first-child').on('click', '.cancel', function() {
FileList.do_delete($('#notification > span').attr('data-oldName'));
});
// Remove delete-action for wiki folder.
if($('#dir').val() == '/'){
$wiki = $("tr[data-file='"+Wiki.wiki+"']");
$wiki.find('td.date').find('a.delete').remove();
$actions = $wiki.find('td.filename').find('a.name').find('span.fileactions');
$actions.find("a[data-action='Rename']").remove();
$actions.find("a[data-action='Share']").remove();
}
});
});

Expand Down
7 changes: 4 additions & 3 deletions l10n/de.php
View file
Expand Up @@ -20,7 +20,7 @@
"No Filename given" => "Kein Dateiname angegeben",
"Create wikilink" => "Erstelle Wikilink",
"Authors" => "Autoren",
"details" => "Detailseite",
"Details" => "Detailseite",
"Usage on ..." => "Verwendung in ...",
"lnk" => "Link zur Detailseite",
"direct" => "Direktlink zum Orginal",
Expand Down Expand Up @@ -62,7 +62,8 @@
"Frame and caption?" => "Rahmen und Bildunterschrift?",
"Description" => "Beschreibung",
"Description of {file}" => "Beschreibung von {file}",
"Update Description for {file}" => "Beschreibung für {file} geändert",
"Update description for {file}" => "Beschreibung für {file} geändert",
"Save changes" => "Speichern",
"Close" => "Schließen"
"Close" => "Schließen",
"Title" => "Title",
);
7 changes: 4 additions & 3 deletions l10n/de_DE.php
View file
Expand Up @@ -20,7 +20,7 @@
"No Filename given" => "Kein Dateiname angegeben",
"Create wikilink" => "Erstelle Wikilink",
"Authors" => "Autoren",
"details" => "Detailseite",
"Details" => "Detailseite",
"Usage on ..." => "Verwendung dieser Datei",
"lnk" => "Link zur Detailseite",
"direct" => "Direktlink zum Orginal",
Expand Down Expand Up @@ -62,7 +62,8 @@
"Frame and caption?" => "Rahmen und Bildunterschrift?",
"Description" => "Beschreibung",
"Description of {file}" => "Beschreibung von {file}",
"Update Description for {file}" => "Beschreibung für {file} geändert",
"Update description for {file}" => "Beschreibung für {file} geändert",
"Save changes" => "Speichern",
"Close" => "Schließen"
"Close" => "Schließen",
"Title" => "Title",
);
18 changes: 13 additions & 5 deletions lib/versions.php
View file
Expand Up @@ -18,6 +18,7 @@
// + Dokuwiki utils
require_once('utils.php');
if(!defined('DOKU_CHANGE_TYPE_MOVE')) define('DOKU_CHANGE_TYPE_MOVE','M');
if(!defined('DOKU_CHANGE_TYPE_REPLACE')) define('DOKU_CHANGE_TYPE_REPLACE','R');

class Storage {

Expand Down Expand Up @@ -141,18 +142,23 @@ public static function store($filename) {
}
}else{
if(!$exists){// There is no post_write hook for files coming from webDAV, so we use this ugly hack
if($isPart) register_shutdown_function('OCA\DokuWiki\Storage::mediaMeta',$filename);
if($isPart) register_shutdown_function('OCA\DokuWiki\Storage::shutdownPartNew',$filename);
}else{
self::saveOldRevision($filename);
if($isPart) register_shutdown_function('OCA\DokuWiki\Storage::shutdownPartReplace',$filename);
}

}
}
}


public static function shutdownPart($filename){
Storage::addMediaMetaEntry(0,'','', \OCP\User::getUser(),$filename);
public static function shutdownPartNew($filename){
Storage::addMediaMetaEntry(0,DOKU_CHANGE_TYPE_CREATE,'', \OCP\User::getUser(),$filename);
}

public static function shutdownPartReplace($filename){
Storage::addMediaMetaEntry(0,DOKU_CHANGE_TYPE_REPLACE,'', \OCP\User::getUser(),$filename);
}

public static function saveOldRevision($filename){
Expand Down Expand Up @@ -273,8 +279,10 @@ public static function rename($old_path, $new_path,$post = false) {
$newmeta = mediaMetaFN($newWikiid,'.changes');
if(@file_exists($oldmeta)){
if (!@file_exists($newmeta)){
$type = DOKU_CHANGE_TYPE_MOVE;
rename($oldmeta,$newmeta);
}else{
$type = DOKU_CHANGE_TYPE_REPLACE;
if(count(file($oldmeta)) > 1) io_saveFile($newmeta,file_get_contents($oldmeta),true); // Only if more than 1 line ("created") exists
unlink($oldmeta);
}
Expand All @@ -296,10 +304,10 @@ public static function rename($old_path, $new_path,$post = false) {
}
}
//addMediaLogEntry($date, $newWikiid, 'm', $sum.' '.$wikiid);
self::addMediaMetaEntry($date,DOKU_CHANGE_TYPE_MOVE,$desc,\OCP\User::getUser(),$new_path,$from);
self::addMediaMetaEntry($date,$type,$desc,\OCP\User::getUser(),$new_path,$from);
//self::addMediaMetaEntryOLD($data['fileid'],$date,'m','','',$new_path,true);
}else{
self::store($old_path);
self::store($old_path);
}
}

Expand Down

0 comments on commit d6d5295

Please sign in to comment.