Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
k-samuel committed Sep 20, 2017
2 parents 4a4908e + 97f3b30 commit e447c70
Show file tree
Hide file tree
Showing 26 changed files with 572 additions and 227 deletions.
4 changes: 2 additions & 2 deletions application/configs/dist/versions.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
return array(
'core'=>'1.0.2',
'designer'=>'1.1',
'core'=>'1.0.3',
'designer'=>'1.2',
'medialib'=>'0.6',
'orm'=>'0.9.9'
);
2 changes: 1 addition & 1 deletion console.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* 2 - Wrong URI
* 3 - Application Error
*/
if (isset($_SERVER['argc']) && $_SERVER['argc']!==2 ){
if (isset($_SERVER['argc']) && $_SERVER['argc']<2 ){
exit(1);
}

Expand Down
2 changes: 1 addition & 1 deletion data/gpl-3.0_en.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DVelum 1.0.2 PROFESSIONAL WEB-DEVELOPMENT PLATFORM
DVelum 1.0.3 PROFESSIONAL WEB-DEVELOPMENT PLATFORM
Copyright (C) 2011-2017, Kirill A Egorov, Andrew Zamotaev, Sergey Leschenko
http://dvelum.net/license.html

Expand Down
2 changes: 1 addition & 1 deletion data/gpl-3.0_ru.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DVelum 1.0.2 платформа профессиональной web-разработки
DVelum 1.0.3 платформа профессиональной web-разработки
Copyright (C) 2011-2017 Кирилл Егоров, Андрей Замотаев, Сергей Лещенко
<http://dvelum.net/license.html>

Expand Down
21 changes: 20 additions & 1 deletion dvelum/app/Backend/Orm/Dataview.php
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,26 @@ public function editorvcAction()
$router->runController('Backend_Orm_Dataview_Editor_Vc' , $request->getPart(4));
}

public function otitleAction()
public function deleteAction()
{
$request = Request::getInstance();

$object = Request::post('d_object','string', false);

if(!$object || !Db_Object_Config::configExists($object)){
Response::jsonError($this->_lang->get('WRONG_REQUEST'));
}

$config = Db_Object_Config::getInstance($object);
$router = new Backend_Router();
if($config->isRevControl()){
$router->runController('Backend_Orm_Dataview_Editor' , 'delete');
}else{
$router->runController('Backend_Orm_Dataview_Editor_Vc' , 'delete');
}
}

public function otitleAction()
{
$object = Request::post('object','string', false);
$id = Request::post('id', 'string', false);
Expand Down
Loading

0 comments on commit e447c70

Please sign in to comment.