tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-03-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/config_process.php
	* operation/users/user_edit.php 
	* godmode/users/configure_user.php:Now global configuration for 
	"flash_charts" and "block_size" options are not override for 
	default user values.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4134 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-03-24 18:35:10 +00:00
parent 1f962dc9c4
commit 71a9cfed49
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2011-03-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/config_process.php
* operation/users/user_edit.php
* godmode/users/configure_user.php:Now global configuration for
"flash_charts" and "block_size" options are not override for
default user values.
2011-03-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb.data.postgreSQL.sql: Forgotten file from my last commit.

5
pandora_console/godmode/users/configure_user.php
View File

@ -310,9 +310,8 @@ if (count($usr_groups) > 1){
}
$table->data[11][0] = __('Flash charts');
$table->data[11][1] = __('Yes').'&nbsp;'.print_radio_button ('flash_charts', 1, '', $user_info["flash_chart"], true).'&nbsp;&nbsp;';
$table->data[11][1] .= __('No').'&nbsp;'.print_radio_button ('flash_charts', 0, '', $user_info["flash_chart"], true);
$values = array(-1 => 'Default',1 => 'Yes',0 => 'No');
$table->data[11][1] = print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false);
$table->data[12][0] = __('Block size for pagination');
$table->data[12][1] = print_input_text ('block_size', $user_info["block_size"], '', 5, 5, true);

4
pandora_console/include/config_process.php
View File

@ -104,9 +104,9 @@ if (isset ($config['id_user'])){
}
// If block_size or flash_chart are provided then override global settings
if (!empty($userinfo["block_size"]))
if (!empty($userinfo["block_size"]) && $userinfo["block_size"] != 0)
$config["block_size"] = $userinfo["block_size"];
if (!empty($userinfo["block_size"]))
if (!empty($userinfo["flash_charts"]) && $userinfo["flash_charts"] == -1)
$config["flash_charts"] = $userinfo["flash_chart"];
// Each user could have it's own timezone)

5
pandora_console/operation/users/user_edit.php
View File

@ -159,9 +159,8 @@ if (count($usr_groups) > 1){
}
echo '</td></tr><tr><td class="datos">'.__('Flash charts').'</td><td class="datos2">';
echo __('Yes').'&nbsp;'.print_radio_button ('flash_charts', 1, '', $user_info["flash_chart"], true).'&nbsp;&nbsp;';
echo __('No').'&nbsp;'.print_radio_button ('flash_charts', 0, '', $user_info["flash_chart"], true);
$values = array(-1 => __('Default'),1 => __('Yes'),0 => __('No'));
echo print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false);
echo '</td></tr><tr><td class="datos">'.__('Block size for pagination').'</td><td class="datos2">';
echo print_input_text ('block_size', $user_info["block_size"], '', 5, 5, true);