Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
281e7d1092
5 changed files with 66 additions and 52 deletions
|
@ -13,10 +13,6 @@ class UserController extends Zend_Controller_Action
|
|||
->initContext();
|
||||
}
|
||||
|
||||
public function indexAction()
|
||||
{
|
||||
}
|
||||
|
||||
public function addUserAction()
|
||||
{
|
||||
global $CC_CONFIG;
|
||||
|
@ -140,6 +136,7 @@ class UserController extends Zend_Controller_Action
|
|||
//$new_owner_id = $this->_getParam("new_owner");
|
||||
//$new_owner = new Application_Model_User($new_owner_id);
|
||||
$user->donateFilesTo( $new_owner );
|
||||
Logging::info("Reassign to user {$new_owner->getDbId()}");
|
||||
}
|
||||
# Finally delete the user
|
||||
$this->view->entries = $user->delete();
|
||||
|
|
|
@ -30,7 +30,8 @@ class CcFiles extends BaseCcFiles {
|
|||
$dt = new DateTime($v);
|
||||
|
||||
} catch (Exception $x) {
|
||||
throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x);
|
||||
throw new PropelException('Error parsing date/time value: ' .
|
||||
var_export($v, true), $x);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -40,8 +41,10 @@ class CcFiles extends BaseCcFiles {
|
|||
return $this;
|
||||
}
|
||||
|
||||
public function reassignTo($user) {
|
||||
public function reassignTo($user)
|
||||
{
|
||||
$this->setDbOwnerId( $user->getDbId() );
|
||||
$this->save();
|
||||
}
|
||||
|
||||
} // CcFiles
|
||||
|
|
|
@ -5,6 +5,10 @@ $(document).ready(function() {
|
|||
afterDetachCSSClass: "floated-panel",
|
||||
savePanelSpace: true
|
||||
});
|
||||
|
||||
|
||||
//this statement tells the browser to fade out any success message after 5 seconds
|
||||
setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000);
|
||||
});
|
||||
|
||||
function adjustDateToServerDate(date, serverTimezoneOffset){
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue