R48546 - in /branches/14.1: addressbook/inc/ etemplate/inc/

Old eGW-svn
1

Author: ralfbecker
New Revision: 48546

URL: http://svn.stylite.de/viewvc/egroupware?rev=48546&view=rev
Log:
fixing the fix: now cat_id=1 got not lost with a 2nd default option set in addressbook (0=None)

Modified:
branches/14.1/addressbook/inc/class.addressbook_ui.inc.php
branches/14.1/etemplate/inc/class.etemplate_widget_menupopup.inc.php
branches/14.1/etemplate/inc/class.etemplate_widget_nextmatch.inc.php

Modified: branches/14.1/addressbook/inc/class.addressbook_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/addressbook/inc/class.addressbook_ui.inc.php?rev=48546&r1=48545&r2=48546&view=diff

— branches/14.1/addressbook/inc/class.addressbook_ui.inc.php (original)
+++ branches/14.1/addressbook/inc/class.addressbook_ui.inc.php Tue Sep 9 16:12:07 2014
@@ -244,7 +244,7 @@
$content[‘nm’] = array_merge($content[‘nm’],$state);
}
}

  •   $sel_options['cat_id'] = array(array('value' => '', 'label' => lang('all')), array('value' => 0, 'label'=>lang('None')));

  •   $sel_options['cat_id'] = array('' => lang('all'), '0' => lang('None'));

  // Delete list action depends on permissions
  if($this->get_lists(EGW_ACL_EDIT))

Modified: branches/14.1/etemplate/inc/class.etemplate_widget_menupopup.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/etemplate/inc/class.etemplate_widget_menupopup.inc.php?rev=48546&r1=48545&r2=48546&view=diff

— branches/14.1/etemplate/inc/class.etemplate_widget_menupopup.inc.php (original)
+++ branches/14.1/etemplate/inc/class.etemplate_widget_menupopup.inc.php Tue Sep 9 16:12:07 2014
@@ -202,7 +202,7 @@
if($this->attrs[‘type’] == ‘select-account’ && !$GLOBALS[‘egw_info’][‘user’][‘apps’][‘admin’] && $select_pref == ‘none’)
{
self::$request->preserv[$this->id] = self::$request->content[$this->id];

  •   		unset(self::$request->content[$this->id]);				

  •   		unset(self::$request->content[$this->id]);
  		$this->attrs['readonly'] = true;
  	}

@@ -256,12 +256,12 @@
// either uses the same ID in the template, or adds the options twice
if(is_numeric($value) && (!is_array($label) || is_array($label) && !array_key_exists(‘value’,$label)))
{

  •   		$check_value = is_array($label) && array_key_exists('value', $label) ? $label['value'] : $value;

  •   		if($value == $check_value)

  •   		$check_value = (string)(is_array($label) && array_key_exists('value', $label) ? $label['value'] : $value);

  •   		if((string)$value === $check_value)
  		{
  			foreach($options as $key => $existing)
  			{

  •   				if(is_array($existing) && $existing['value'] == $check_value && $key != $value)

  •   				if(is_array($existing) && isset($existing['value']) && (string)$existing['value'] === $check_value && $key != $value)
  				{
  					unset($options[$value]);
  					continue 2;

Modified: branches/14.1/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/etemplate/inc/class.etemplate_widget_nextmatch.inc.php?rev=48546&r1=48545&r2=48546&view=diff

— branches/14.1/etemplate/inc/class.etemplate_widget_nextmatch.inc.php (original)
+++ branches/14.1/etemplate/inc/class.etemplate_widget_nextmatch.inc.php Tue Sep 9 16:12:07 2014
@@ -188,8 +188,7 @@
{
$value[‘options-cat_id’][’’] = lang(‘all’);
}

  •   	$value['options-cat_id'] = array_merge($value['options-cat_id'],

  •   		etemplate_widget_menupopup::typeOptions('select-cat', ',,'.$cat_app,$no_lang,false,$value['cat_id']));

  •   	$value['options-cat_id'] += etemplate_widget_menupopup::typeOptions('select-cat', ',,'.$cat_app,$no_lang,false,$value['cat_id']);
  	etemplate_widget_menupopup::fix_encoded_options($value['options-cat_id']);
  }

Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce.
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk

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