[evolvis-commits] r18076: small-fixes pending merges:↵ Thorsten Glaser 2012-02-01 [#2434] translation fix↵ Thorsten Glaser 2012-02-01 [#2447] relations are text fields, too↵ Thorsten Glaser 2012-02-01 fix form tag closing↵ Thorsten Glaser 2012-02-01 [#2506] display the submenu (with submit) only if got privs to do so↵ [#2555] Thorsten Glaser 2012-02-01 merge widget privilegue check fixes from lo-lan-do↵ Thorsten Glaser 2012-02-01 [#2552] fix stopping monitoring of fora↵ Thorsten Glaser 2012-02-01 XHTML fix (inverse logic error)
mirabilos at evolvis.org
mirabilos at evolvis.org
Wed Feb 1 14:03:25 CET 2012
Author: mirabilos
Date: 2012-02-01 14:03:25 +0100 (Wed, 01 Feb 2012)
New Revision: 18076
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/widget/WidgetLayoutManager.class.php
trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyMonitoredForums.class.php
trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
trunk/gforge_base/evolvisforge-5.1/src/www/forum/monitor.php
trunk/gforge_base/evolvisforge-5.1/src/www/news/news_utils.php
trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-addextrafield.php
trunk/gforge_base/evolvisforge-5.1/src/www/widgets/updatelayout.php
Log:
small-fixes pending merges:
Thorsten Glaser 2012-02-01 [#2434] translation fix
Thorsten Glaser 2012-02-01 [#2447] relations are text fields, too
Thorsten Glaser 2012-02-01 fix form tag closing
Thorsten Glaser 2012-02-01 [#2506] display the submenu (with submit) only if got privs to do so
[#2555] Thorsten Glaser 2012-02-01 merge widget privilegue check fixes from lo-lan-do
Thorsten Glaser 2012-02-01 [#2552] fix stopping monitoring of fora
Thorsten Glaser 2012-02-01 XHTML fix (inverse logic error)
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/WidgetLayoutManager.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/WidgetLayoutManager.class.php 2012-02-01 13:03:20 UTC (rev 18075)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/WidgetLayoutManager.class.php 2012-02-01 13:03:25 UTC (rev 18076)
@@ -115,7 +115,7 @@
}
break;
case self::OWNER_TYPE_GROUP:
- if (UserManager::instance()->getCurrentUser()->is_super_user==true || forge_check_perm('project_admin', $owner_id, NULL)) { //Only project admin
+ if (forge_check_perm('project_admin', $owner_id, NULL)) { //Only project admin
$readonly = false;
}
break;
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyMonitoredForums.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyMonitoredForums.class.php 2012-02-01 13:03:20 UTC (rev 18075)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyMonitoredForums.class.php 2012-02-01 13:03:25 UTC (rev 18076)
@@ -90,7 +90,7 @@
list($hide_now,$count_diff,$hide_url) = my_hide_url('forum',$group_id,$hide_item_id,$rows2,$hide_forum);
- $html_hdr = ($j ? '<tr class="boxitem"><td colspan="2">' : '').
+ $html_hdr = ($j ? '' : '<tr class="boxitem"><td colspan="2">').
$hide_url.'<a href="/forum/?group_id='.$group_id.'">'.
db_result($result,$j,'group_name').'</a> ';
@@ -112,7 +112,7 @@
<tr class="'. $class .'"><td width="99%">'.
' - <a href="/forum/forum.php?forum_id='.$group_forum_id.'">'.
stripslashes(db_result($result2,$i,'forum_name')).'</a></td>'.
- '<td align="center"><a href="/my/stop_monitor.php?forum_id='.$group_forum_id.
+ '<td align="center"><a href="/forum/monitor.php?forum_id='.$group_forum_id.'&group_id='.$group_id.'&stop=1' .
'" onclick="return confirm(\''._("Stop monitoring this Forum?").'\')">'.
'<img src="'.$GLOBALS['HTML']->imgroot.'ic/trash.png" height="16" width="16" '.
'border="0" alt="'._("Stop monitoring").'" /></a></td></tr>';
Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po 2012-02-01 13:03:20 UTC (rev 18075)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po 2012-02-01 13:03:25 UTC (rev 18076)
@@ -18952,7 +18952,7 @@
#: www/tracker/admin/form-addextrafield.php:138
msgid "Text Field Size/Text Area Rows"
-msgstr "Textfeldgröße /Textbereich Spalten"
+msgstr "Textfeldgröße /Textbereich Zeilen"
#: www/tracker/admin/form-addextrafield.php:140
msgid "Text Field Maxlength/Text Area Columns"
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/forum/monitor.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/forum/monitor.php 2012-02-01 13:03:20 UTC (rev 18075)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/forum/monitor.php 2012-02-01 13:03:25 UTC (rev 18076)
@@ -50,22 +50,6 @@
}
if (getStringFromRequest('stop')) {
- $confirm = getStringFromRequest('confirm');
- $cancel = getStringFromRequest('cancel');
- if ($cancel) {
- session_redirect('/forum/forum.php?forum_id='.$forum_id.'&group_id='.$group_id);
- }
- if (!$confirm) {
- forum_header(array('title'=>_('Stop Monitoring')));
- echo $HTML->confirmBox(
- sprintf(_('You are about to stop monitoring the %1$s forum.'),$f->getName()).
- '<br/><br/>'.
- _('Do you really want to unsubscribe ?'),
- array('group_id' => $group_id, 'forum_id' => $forum_id, 'stop' => 1),
- array('confirm' => _('Unsubscribe'), 'cancel' => _('Cancel')) );
- forum_footer(array());
- exit;
- }
if (!$f->stopMonitor()) {
exit_error($f->getErrorMessage(),'forums');
} else {
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/news/news_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/news/news_utils.php 2012-02-01 13:03:20 UTC (rev 18075)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/news/news_utils.php 2012-02-01 13:03:25 UTC (rev 18076)
@@ -33,7 +33,8 @@
$params['toptab']='news';
$params['group']=$group_id;
- if ($group_id && ($group_id != forge_get_config('news_group'))) {
+ if ($group_id && ($group_id != forge_get_config('news_group')) &&
+ forge_check_perm('project_admin', $group_id)) {
$menu_texts=array();
$menu_links=array();
$menu_ttips=array();
@@ -46,16 +47,13 @@
$menu_links[]='/news/submit.php?group_id='.$group_id;
$menu_ttips[]=_('-tooltip:news:new');
- if (session_loggedin()) {
- $project = group_get_object($params['group']);
- if ($project && is_object($project) && !$project->isError()) {
- if (forge_check_perm ('project_admin', $group_id)) {
- $menu_texts[]=_('Administration');
- $menu_links[]='/news/admin/?group_id='.$group_id;
- $menu_ttips[]=_('-tooltip:news:admin');
- }
- }
+ $project = group_get_object($params['group']);
+ if ($project && is_object($project) && !$project->isError()) {
+ $menu_texts[]=_('Administration');
+ $menu_links[]='/news/admin/?group_id='.$group_id;
+ $menu_ttips[]=_('-tooltip:news:admin');
}
+
$params['submenu'] = array($menu_texts,$menu_links,$menu_ttips);
}
/*
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php 2012-02-01 13:03:20 UTC (rev 18075)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php 2012-02-01 13:03:25 UTC (rev 18076)
@@ -251,7 +251,7 @@
pm_header(array ('title'=>$title));
?>
<p />
- <form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id; ?>" method="post" />
+ <form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id; ?>" method="post">
<input type="hidden" name="update_cat" value="y" />
<input type="hidden" name="id" value="<?php echo $ac->getID(); ?>" />
<input type="hidden" name="group_project_id" value="<?php echo $pg->getID(); ?>" />
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-addextrafield.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-addextrafield.php 2012-02-01 13:03:20 UTC (rev 18075)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-addextrafield.php 2012-02-01 13:03:25 UTC (rev 18076)
@@ -134,7 +134,7 @@
<!--<input type="radio" name="field_type" value="8" /> <?php echo _('Box type technician'); ?><br />-->
<input type="radio" name="field_type" value="9" /> <?php echo _('Relation between artifacts'); ?><br />
</p><p>
- <?php echo _('Text Fields and Text Areas need to have Size/Maxlength and Rows/Cols defined, respectively.'); ?><br />
+ <?php echo _('Text Fields, Text Areas and Relatioins between artifacts need to have Size/Maxlength and Rows/Cols defined, respectively.'); ?><br />
<?php echo _('Text Field Size/Text Area Rows'); ?>
<input type="text" name="attribute1" value="20" size="2" maxlength="2" /><br />
<?php echo _('Text Field Maxlength/Text Area Columns'); ?>
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/widgets/updatelayout.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/widgets/updatelayout.php 2012-02-01 13:03:20 UTC (rev 18075)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/widgets/updatelayout.php 2012-02-01 13:03:25 UTC (rev 18076)
@@ -76,9 +76,9 @@
switch($action) {
case 'remove':
$instance_id = (int)$param[$name][$action];
- if(forge_check_perm ('project_admin', $owner_id, NULL)) {
- $lm->removeWidget($owner_id, $owner_type, $layout_id, $name, $instance_id, $widget);
- }
+ if ($owner_type != WidgetLayoutManager::OWNER_TYPE_GROUP || forge_check_perm('project_admin', $owner_id, NULL)) {
+ $lm->removeWidget($owner_id, $owner_type, $layout_id, $name, $instance_id, $widget);
+ }
break;
case 'add':
default:
More information about the evolvis-commits
mailing list