app.js

leithoff 2016-04-29 13:19:32 UTC #1

Author: leithoff
New Revision: 55943

URL: http://svn.stylite.de/viewvc/egroupware?rev=55943&view=rev
Log:
fix remainig issues with moving mail 2 archive; fix issue when using quick-move-actions (target folder not set)

Modified:
trunk/mail/inc/class.mail_ui.inc.php
trunk/mail/js/app.js

Modified: trunk/mail/inc/class.mail_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/inc/class.mail_ui.inc.php?rev=55943&r1=55942&r2=55943&view=diff

— trunk/mail/inc/class.mail_ui.inc.php (original)
+++ trunk/mail/inc/class.mail_ui.inc.php Fri Apr 29 15:19:32 2016
@@ -912,7 +912,8 @@
//error_log(METHOD.LINE."$i => $lastFolderUsedForMoveCont");
if (!empty($lastFolderUsedForMoveCont)) // only 10 entries per mailaccount.Control this on setting the buffered folders
{

```
  				$moveaction = 'move_';
```

  				$moveaction = 'move_'.$lastFolderUsedForMoveCont;

  				//error_log(__METHOD__.__LINE__.'#'.$moveaction);
  				$fS = array();
  				$fS['profileID'] = $pid;
  				$fS['profileName'] = $accArray[$pid];

@@ -4744,17 +4745,27 @@
* @param array _folderName target folder
* @param array _messageList list of UID’s
* @param string _copyOrMove method to use copy or move allowed

- @param string _move2ArchiveMarker marker to indicate if a move 2 archive was triggered
- @return xajax response
  */

function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove=‘copy’)
{

  if(Mail::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove);

function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove=‘copy’, $move2ArchiveMarker=’’)
{

  if(Mail::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove.' ArchiveMarker:'.$_move2ArchiveMarker);
  translation::add_app('mail');
  $_folderName = $this->mail_bo->decodeEntityFolderName($_folderName);
  // only copy or move are supported as method
  if (!($_copyOrMove=='copy' || $_copyOrMove=='move')) $_copyOrMove='copy';
  list($targetProfileID,$targetFolder) = explode(self::$delimiter,$_folderName,2);

  // check if move2archive was called with the correct archiveFolder

  $archiveFolder = $this->mail_bo->getArchiveFolder();

  if ($_move2ArchiveMarker=='2' && $targetFolder != $archiveFolder)

```
  {
```

  	error_log(__METHOD__.__LINE__."#Move to Archive called with:"."$targetProfileID,$targetFolder");

  	$targetProfileID = $this->mail_bo->profileID;

```
  	$targetFolder = $archiveFolder;
```

  	error_log(__METHOD__.__LINE__."#Fixed ArchiveFolder:"."$targetProfileID,$targetFolder");

  }
  $lastFoldersUsedForMoveCont = egw_cache::getCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
  $changeFolderActions = false;
  //error_log(__METHOD__.__LINE__."#"."$targetProfileID,$targetFolder");

Modified: trunk/mail/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/js/app.js?rev=55943&r1=55942&r2=55943&view=diff

— trunk/mail/js/app.js (original)
+++ trunk/mail/js/app.js Fri Apr 29 15:19:32 2016
@@ -3136,7 +3136,8 @@

	var self = this;
	var nm = this.et2.getWidgetById(this.nm_index);

  egw.json('mail.mail_ui.ajax_copyMessages',[target, messages, 'move'], function(){

  // thev 4th param indicates if it is a normal move messages action. if not the action is a move2.... (archiveFolder) action

  egw.json('mail.mail_ui.ajax_copyMessages',[target, messages, 'move', (_action.id.substr(0,4)=='move'&&_action.id.substr(4,1)=='2'?'2':'_') ], function(){
  	self.unlock_tree();
  	// Nextmatch automatically selects the next row and calls preview.
  	// Unselect it and thanks to the timeout selectionMgr uses, preview

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs