Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 99da30d

Browse files
author
Julien Jomier
committed
BUG: Errors with PDO
1 parent ef970da commit 99da30d

File tree

3 files changed

+33
-36
lines changed

3 files changed

+33
-36
lines changed

core/models/base/FeedpolicyuserModelBase.php

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,6 @@ public function __construct()
2020
);
2121
$this->initialize(); // required
2222
} // end __construct()
23-
24-
/** create a policy
25-
* @return FolderpolicyuserDao*/
26-
public function createPolicy($user, $folder, $policy)
27-
{
28-
if(!$user instanceof UserDao)
29-
{
30-
throw new Zend_Exception("Should be a user.");
31-
}
32-
if(!$folder instanceof FolderDao)
33-
{
34-
throw new Zend_Exception("Should be a folder.");
35-
}
36-
if(!is_numeric($policy))
37-
{
38-
throw new Zend_Exception("Should be a number.");
39-
}
40-
if(!$user->saved && !$folder->saved)
41-
{
42-
throw new Zend_Exception("Save the daos first.");
43-
}
44-
if($this->getPolicy($user, $folder)!==false)
45-
{
46-
$this->delete($this->getPolicy($user, $folder));
47-
}
48-
$this->loadDaoClass('FolderpolicyuserDao');
49-
$policyUser=new FolderpolicyuserDao();
50-
$policyUser->setUserId($user->getUserId());
51-
$policyUser->setFolderId($folder->getFolderId());
52-
$policyUser->setPolicy($policy);
53-
$this->save($policyUser);
54-
return $policyUser;
55-
}
56-
23+
5724
} // end class FeedpolicyuserModelBase
5825
?>

core/models/base/FolderpolicyuserModelBase.php

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,38 @@ public function __construct()
2121
$this->initialize(); // required
2222
} // end __construct()
2323

24-
24+
/** create a policy
25+
* @return FolderpolicyuserDao*/
26+
public function createPolicy($user, $folder, $policy)
27+
{
28+
if(!$user instanceof UserDao)
29+
{
30+
throw new Zend_Exception("Should be a user.");
31+
}
32+
if(!$folder instanceof FolderDao)
33+
{
34+
throw new Zend_Exception("Should be a folder.");
35+
}
36+
if(!is_numeric($policy))
37+
{
38+
throw new Zend_Exception("Should be a number.");
39+
}
40+
if(!$user->saved && !$folder->saved)
41+
{
42+
throw new Zend_Exception("Save the daos first.");
43+
}
44+
if($this->getPolicy($user, $folder)!==false)
45+
{
46+
$this->delete($this->getPolicy($user, $folder));
47+
}
48+
$this->loadDaoClass('FolderpolicyuserDao');
49+
$policyUser=new FolderpolicyuserDao();
50+
$policyUser->setUserId($user->getUserId());
51+
$policyUser->setFolderId($folder->getFolderId());
52+
$policyUser->setPolicy($policy);
53+
$this->save($policyUser);
54+
return $policyUser;
55+
}
2556

2657
} // end class FolderpolicyuserModelBase
2758
?>

library/MIDAS/models/MIDASDatabasePdo.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ public function save($dataarray)
273273
{
274274
return false;
275275
}
276-
$dao->saved=true;
277276
return $insertedid;
278277
}
279278
} // end method save

0 commit comments

Comments
 (0)