Skip to content
Snippets Groups Projects

Master

Merged Laurent requested to merge master into WIP
Compare and
+ 440
88
Preferences
Compare changes
Files
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class Admin_UploadController extends Zend_Controller_Action {
public function preDispatch(){
@@ -65,8 +65,11 @@ $(document).ready(function () {
return;
}
$this->_helper->json($model->addFile($this->_request));
$result = $model->addFile($this->_request);
$model->save();
$model->index();
$this->_helper->json($result);
return;
}