Skip to content

Commit

Permalink
Merge pull request #36 from oat-sa/release-1.3.0
Browse files Browse the repository at this point in the history
Release 1.3.0
  • Loading branch information
llecaque committed Apr 25, 2016
2 parents fd50d8d + c08980f commit bbb439e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion manifest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
'label' => 'extension-tao-dac-simple',
'description' => 'extension that allows admin to give access to some resources to other people',
'license' => 'GPL-2.0',
'version' => '1.2.2',
'version' => '1.3.0',
'author' => 'Open Assessment Technologies SA',
'requires' => array(
'taoBackOffice' => '>=0.9'
Expand Down
11 changes: 8 additions & 3 deletions model/action/AdminAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,20 @@
namespace oat\taoDacSimple\model\action;

use oat\tao\model\menu\Icon;
use oat\taoBackOffice\model\menuStructure\Action;
use oat\taoBackOffice\model\menuStructure\Action as MenuAction;
use oat\oatbox\PhpSerializeStateless;
use oat\oatbox\PhpSerializable;

/**
* Admin Action, based on xml:
*
* <action id="access-control-admin" name="Access control" url="/taoDacSimple/AdminAccessController/adminPermissions" group="tree" context="resource">
* <icon id="icon-unlock" />
* </action>
*/
class AdminAction implements Action {
class AdminAction implements MenuAction, PhpSerializable {

use PhpSerializeStateless;

/**
* @return string Identifier of action
Expand Down Expand Up @@ -90,5 +95,5 @@ public function getIcon()
'src' => null
));
}

}
4 changes: 2 additions & 2 deletions scripts/update/Updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function update($initialVersion) {
$this->setVersion('1.2.0');
}

$this->skip('1.2.0','1.2.2');
$this->skip('1.2.0','1.3.0');
return null;
}
}
}

0 comments on commit bbb439e

Please sign in to comment.