deV: minor fixes to permissions / auditlog

LimeSurvey · Apr 2, 2013 · 6f4cc78 · 6f4cc78
1 parent d6da110
commit 6f4cc78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/models/Permission.php b/application/models/Permission.php
@@ -125,7 +125,7 @@ public static function getPermissions($iUserID, $iEntityID=null, $sEntityName=nu
         else
         {
             foreach ($aBasePermissions as $sPermission=>&$aPermissionDetail){
-                $oCurrentPermissions=Permission::model()->findByAttributes(array('uid'=>$iUserID,'sid'=>$iSurveyID, 'permission'=>$sPermission));
+                $oCurrentPermissions=Permission::model()->findByAttributes(array('uid'=>$iUserID,'entity_id'=>$iEntityID, 'permission'=>$sPermission));
                 if ($aPermissionDetail['create']) $aPermissionDetail['create']=($oCurrentPermissions?(boolean)$oCurrentPermissions->create_p:false);
                 if ($aPermissionDetail['read']) $aPermissionDetail['read']=($oCurrentPermissions?(boolean)$oCurrentPermissions->read_p:false);
                 if ($aPermissionDetail['update']) $aPermissionDetail['update']=($oCurrentPermissions?(boolean)$oCurrentPermissions->update_p:false);

diff --git a/plugins/AuditLog/AuditLog.php b/plugins/AuditLog/AuditLog.php
@@ -37,7 +37,7 @@ public function beforePermissionSetSave()
                 $oAutoLog = $this->api->newModel($this, 'log');
                 $oAutoLog->uid=$oCurrentUser->uid;
                 $oAutoLog->entity='permission';
-                $oAutoLog->entityid=$aNewPermissions['uid'].'-'.$aNewPermissions['sid'];
+                $oAutoLog->entityid=$iSurveyID;
                 $oAutoLog->action=$sAction;
                 $oAutoLog->oldvalues=json_encode(array_diff_assoc_recursive($oOldPermission,$aNewPermissions));
                 $oAutoLog->newvalues=json_encode(array_diff_assoc_recursive($aNewPermissions,$oOldPermission));