Skip to content

Commit

Permalink
Fixed issue : No group managment in Yii
Browse files Browse the repository at this point in the history 
Fixed issue : Javascript error with alert in public survey
Fixed issue #06193 : AdminController cannot find the requested view "/admin/user/setUserRights"
  • Loading branch information
@Shnoulle
Shnoulle committed Jun 13, 2012
1 parent 4912025 commit e739efc
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion application/controllers/admin/useraction.php
View file
Expand Up @@ -413,7 +413,7 @@ function setUserRights()
) // if(Yii::app()->session['loginID'] != $postuserid)
{
$aData['postuserid'] = $postuserid;
$this->_renderWrappedTemplate('user', 'setUserRights', $aData);
$this->_renderWrappedTemplate('user', 'setuserrights', $aData);
} // if
else
{
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/usergroups.php
View file
Expand Up @@ -277,7 +277,7 @@ public function index($ugid = false, $header = false)

$aViewUrls = array();
$aData['ugid'] = $ugid;

$aData['imageurl'] = Yii::app()->getConfig("adminimageurl");
$clang = Yii::app()->lang;

if (Yii::app()->session['loginID']) {
Expand Down
6 changes: 3 additions & 3 deletions application/core/Survey_Common_Action.php
View file
Expand Up @@ -903,8 +903,8 @@ function _userGroupBar($ugid = 0)

if (!empty($ugid)) {
$grpquery = "SELECT gp.* FROM {{user_groups}} AS gp, {{user_in_groups}} AS gu WHERE gp.ugid=gu.ugid AND gp.ugid = $ugid AND gu.uid=" . Yii::app()->session['loginID'];
$grpresult = dbExecuteAssoc($grpquery);
$grpresultcount = dbRecordsCount($grpquery);
$grpresult = Yii::app()->db->createCommand($grpquery)->query(); //Checked
$grpresultcount = $grpresult->getRowCount();

if ($grpresultcount > 0) {
$grow = array_map('htmlspecialchars', $grpresult->read());
Expand All @@ -920,7 +920,7 @@ function _userGroupBar($ugid = 0)
}

$data['ugid'] = $ugid;

$data['imageurl'] = Yii::app()->getConfig("adminimageurl"); // Don't came from rendertemplate ?
$this->getController()->render('/admin/usergroup/usergroupbar_view', $data);
}

Expand Down
7 changes: 3 additions & 4 deletions application/helpers/SurveyRuntimeHelper.php
View file
Expand Up @@ -714,6 +714,9 @@ function run($surveyid,$args) {
sendCacheHeaders();
doHeader();

$redata = compact(array_keys(get_defined_vars()));
echo templatereplace(file_get_contents("$thistpl/startpage.pstpl"), array(), $redata);
//popup need jquery
if (isset($popup))
{
echo $popup;
Expand All @@ -727,10 +730,6 @@ function run($surveyid,$args) {
echo $fpopup;
}

$redata = compact(array_keys(get_defined_vars()));

echo templatereplace(file_get_contents("$thistpl/startpage.pstpl"), array(), $redata);

//ALTER PAGE CLASS TO PROVIDE WHOLE-PAGE ALTERNATION
if ($surveyMode != 'survey' && $_SESSION[$LEMsessid]['step'] != $_SESSION[$LEMsessid]['prevstep'] ||
(isset($_SESSION[$LEMsessid]['stepno']) && $_SESSION[$LEMsessid]['stepno'] % 2))
Expand Down
3 changes: 2 additions & 1 deletion application/views/admin/super/adminmenu.php
View file
Expand Up @@ -27,7 +27,8 @@

<a href="<?php echo $this->createUrl("admin/user/index"); ?>">
<img src='<?php echo $sImageURL;?>security.png' alt='<?php $clang->eT("Manage survey administrators");?>' width='<?php echo $iconsize;?>' height='<?php echo $iconsize;?>'/></a>

<a href="<?php echo $this->createUrl("admin/usergroups/index"); ?>">
<img src='<?php echo $sImageURL;?>usergroup.png' alt='<?php $clang->eT("Create/Edit Groups");?>' width='<?php echo $iconsize;?>' height='<?php echo $iconsize;?>'/></a>
<?php
if(Yii::app()->session['USER_RIGHT_CONFIGURATOR'] == 1)
{ ?>
Expand Down
32 changes: 16 additions & 16 deletions application/views/admin/usergroup/usergroupbar_view.php
View file
Expand Up @@ -10,45 +10,45 @@
</div>
<div class='menubar-main'>
<div class='menubar-left'>
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/blank.gif' alt='' width='55' height='20' />
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/separator.gif' alt='' />
<img src='<?php echo $imageurl; ?>/blank.gif' alt='' width='55' height='20' />
<img src='<?php echo $imageurl; ?>/separator.gif' alt='' />

<?php if($ugid && $grpresultcount > 0)
{ ?>
<a href="<?php echo $this->createUrl("admin/usergroups/mail/ugid/".$ugid); ?>">
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/invite.png' alt='<?php $clang->eT("Mail to all Members"); ?>' name='MailUserGroup' /></a>
<img src='<?php echo $imageurl; ?>/invite.png' alt='<?php $clang->eT("Mail to all Members"); ?>' name='MailUserGroup' /></a>
<?php }
else
{ ?>
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/blank.gif' alt='' width='40' height='20' />
<img src='<?php echo $imageurl; ?>/blank.gif' alt='' width='40' height='20' />
<?php } ?>
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/blank.gif' alt='' width='78' height='20' />
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/separator.gif' alt='' />
<img src='<?php echo $imageurl; ?>/blank.gif' alt='' width='78' height='20' />
<img src='<?php echo $imageurl; ?>/separator.gif' alt='' />

<?php if($ugid && $grpresultcount > 0 &&
Yii::app()->session['loginID'] == $grow['owner_id'])
{ ?>
<a href="<?php echo $this->createUrl("admin/usergroups/edit/ugid/".$ugid); ?>">
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/edit.png' alt='<?php $clang->eT("Edit current user group"); ?>' name='EditUserGroup' /></a>
<img src='<?php echo $imageurl; ?>/edit.png' alt='<?php $clang->eT("Edit current user group"); ?>' name='EditUserGroup' /></a>
<?php }
else
{ ?>
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/blank.gif' alt='' width='40' height='20' />
<img src='<?php echo $imageurl; ?>/blank.gif' alt='' width='40' height='20' />
<?php }

if($ugid && $grpresultcount > 0 &&
Yii::app()->session['loginID'] == $grow['owner_id'])
{ ?>

<a href='#' onclick="if (confirm('<?php $clang->eT("Are you sure you want to delete this entry?","js"); ?>')) { <?php echo convertGETtoPOST($this->createUrl('admin/usergroups/delete')."?action=delusergroup&amp;ugid=$ugid"); ?>}">
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/delete.png' alt='<?php $clang->eT("Delete current user group"); ?>' name='DeleteUserGroup' /></a>
<img src='<?php echo $imageurl; ?>/delete.png' alt='<?php $clang->eT("Delete current user group"); ?>' name='DeleteUserGroup' /></a>
<?php }
else
{ ?>
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/blank.gif' alt='' width='40' height='20' />
<img src='<?php echo $imageurl; ?>/blank.gif' alt='' width='40' height='20' />
<?php } ?>
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/blank.gif' alt='' width='92' height='20' />
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/separator.gif' alt='' />
<img src='<?php echo $imageurl; ?>/blank.gif' alt='' width='92' height='20' />
<img src='<?php echo $imageurl; ?>/separator.gif' alt='' />
</div>
<div class='menubar-right'>
<label for="ugid"><?php $clang->eT("User groups"); ?>:</label> <select name='ugid' id='ugid' onchange="window.location=this.options[this.selectedIndex].value">
Expand All @@ -57,10 +57,10 @@
<?php if (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1)
{ ?>
<a href='<?php echo $this->createUrl("admin/usergroups/add"); ?>'>
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/add.png' alt='<?php $clang->eT("Add new user group"); ?>' /></a>
<img src='<?php echo $imageurl; ?>/add.png' alt='<?php $clang->eT("Add new user group"); ?>' /></a>
<?php } ?>
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/separator.gif' alt='' />
<img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/blank.gif' alt='' width='82' height='20' />
<img src='<?php echo $imageurl; ?>/separator.gif' alt='' />
<img src='<?php echo $imageurl; ?>/blank.gif' alt='' width='82' height='20' />
</div></div>
</div>
<p style='margin:0;font-size:1px;line-height:1px;height:1px;'>&nbsp;</p>
<p style='margin:0;font-size:1px;line-height:1px;height:1px;'>&nbsp;</p>
Binary file added styles/blobblueish/images/usergroup.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added styles/gartergrey/images/usergroup.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added styles/gringegreen/images/usergroup.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e739efc

Please sign in to comment.