Merge branch 'saas-dev' into saas-dev-publishing
Conflicts: airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php airtime_mvc/public/css/dashboard.css airtime_mvc/public/js/airtime/library/spl.js
This commit is contained in:
commit
95aae317c6
26 changed files with 189 additions and 63 deletions
|
@ -375,6 +375,9 @@ class LibraryController extends Zend_Controller_Action
|
|||
|
||||
if ($form->isValid($serialized)) {
|
||||
$file->setDbColMetadata($serialized);
|
||||
$this->view->status = true;
|
||||
} else {
|
||||
$this->view->status = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue