Skip to content

https://github.com/TwistedInteractive/author_roles/issues/28 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kirkstrobeck wants to merge 6 commits into
base: master
Choose a base branch
from
Open

https://github.com/TwistedInteractive/author_roles/issues/28 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94eb234
https://github.com/TwistedInteractive/author_roles/issues/28
kirkstrobeck May 17, 2016
131d5d4
https://github.com/TwistedInteractive/author_roles/issues/28
kirkstrobeck May 17, 2016
d5ed18a
https://github.com/TwistedInteractive/author_roles/issues/28
kirkstrobeck May 17, 2016
254af9f
Add meta
kirkstrobeck May 18, 2016
89bb69c
max
kirkstrobeck May 18, 2016
d549691
new on top. 1.3
kirkstrobeck May 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions content/content.index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
require_once(TOOLKIT . '/class.administrationpage.php');

Class contentExtensionAuthor_rolesIndex extends AdministrationPage
{
protected $_uri = null;
Expand All @@ -21,7 +21,7 @@ function __construct(){
*/
public function build($context)
{
if(Administration::instance()->Author->isDeveloper()) {
if(Administration::instance()->Author()->isDeveloper()) {
if($_POST['with-selected'] == 'delete' && is_array($_POST['items']))
{
foreach($_POST['items'] as $id_role => $value)
Expand All @@ -41,7 +41,7 @@ public function view()
$this->setTitle('Symphony &ndash; Roles');
$this->__viewIndex();
}

// The Index:
public function __viewIndex()
{
Expand All @@ -51,16 +51,16 @@ public function __viewIndex()
__('Create New'), $this->_uri.'roles/new/',
__('Create a new role'), 'create button'
));

// Set the table head:
$tableHead = array(
array(__('Role Name'), 'col'),
array(__('Authors with this role'), 'col')
);

// Set the table body:
$tableBody = array();

// Fill the table with available roles:
$roles = $this->_driver->getRoles();
if(empty($roles))
Expand All @@ -76,7 +76,7 @@ public function __viewIndex()
$td = new XMLElement('td', '<a href="'.$this->_url.'roles/edit/'.$role['id'].'/">'.$role['name'].'</a>');
$td->appendChild(Widget::Input('items['.$role['id'].']', NULL, 'checkbox'));
$row->appendChild($td);

// Authors:
$authors = $this->_driver->getAuthors($role['id']);
if(empty($authors)) {
Expand All @@ -96,10 +96,10 @@ public function __viewIndex()
$tableBody[] = $row;
}
}

// Create the table element:
$table = Widget::Table(
Widget::TableHead($tableHead), null,
Widget::TableHead($tableHead), null,
Widget::TableBody($tableBody), 'selectable'
);
$this->Form->appendChild($table);
Expand All @@ -118,4 +118,4 @@ public function __viewIndex()
$this->Form->appendChild($tableActions);
}
}
?>
?>
18 changes: 9 additions & 9 deletions extension.driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function fetchNavigation() {
public function extendNavigation($context) {
$data = $this->getCurrentAuthorRoleData();

if($data == false || Administration::instance()->Author->isDeveloper()) {
if($data == false || Administration::instance()->Author()->isDeveloper()) {
return;
}

Expand Down Expand Up @@ -153,7 +153,7 @@ public function deleteAuthorRole($context) {
* The context, providing the form and the author object
*/
public function addRolePicker($context) {
if(Administration::instance()->Author->isDeveloper()) {
if(Administration::instance()->Author()->isDeveloper()) {
$group = new XMLElement('fieldset');
$group->setAttribute('class', 'settings');
$group->appendChild(new XMLElement('legend', __('Author Role')));
Expand Down Expand Up @@ -232,7 +232,7 @@ public function checkCallback($context) {
private function adjustIndex($context, $callback) {
$data = $this->getCurrentAuthorRoleData();

if($data == false || Administration::instance()->Author->isDeveloper()) {
if($data == false || Administration::instance()->Author()->isDeveloper()) {
return;
}

Expand Down Expand Up @@ -266,7 +266,7 @@ private function adjustIndex($context, $callback) {
if($rules['own_entries'] == 1 || $rules['edit'] == 0 || $rules['delete'] == 0 || $rules['use_filter'] == 1) {
// For only show entries created by this author:
// Get a list of entry id's created by this author:
$id_author = Administration::instance()->Author->get('id');
$id_author = Administration::instance()->Author()->get('id');

if($rules['own_entries'] == 1) {
// Only get the ID's of the current author to begin with:
Expand Down Expand Up @@ -428,7 +428,7 @@ private function adjustIndex($context, $callback) {
public function makePreAdjustements($context) {
$data = $this->getCurrentAuthorRoleData();

if($data == false || Administration::instance()->Author->isDeveloper()) {
if($data == false || Administration::instance()->Author()->isDeveloper()) {
return;
}

Expand Down Expand Up @@ -493,7 +493,7 @@ private static function replaceChild($parent, $child) {
private function adjustEntryEditor($context, $callback) {
$data = $this->getCurrentAuthorRoleData();

if($data == false || Administration::instance()->Author->isDeveloper()) {
if($data == false || Administration::instance()->Author()->isDeveloper()) {
return;
}

Expand Down Expand Up @@ -580,7 +580,7 @@ private function adjustEntryEditor($context, $callback) {
*/
private function getCurrentAuthorRoleData() {
if(Administration::instance()->isLoggedIn()) {
$id_author = Administration::instance()->Author->get('id');
$id_author = Administration::instance()->Author()->get('id');
$id_role = $this->getAuthorRole($id_author);

if($id_role != false) {
Expand All @@ -601,7 +601,7 @@ private function getCurrentAuthorRoleData() {
public function modifyAreas($context) {
$data = $this->getCurrentAuthorRoleData();

if($data == false || Administration::instance()->Author->isDeveloper()) {
if($data == false || Administration::instance()->Author()->isDeveloper()) {
return;
}

Expand All @@ -622,7 +622,7 @@ public function modifyAreas($context) {
* The context
*/
public function saveAuthorRole($context) {
if(Administration::instance()->Author->isDeveloper()) {
if(Administration::instance()->Author()->isDeveloper()) {
$id_role = intval($_POST['fields']['role']);
$id_author = $context['author']->get('id');

Expand Down
7 changes: 5 additions & 2 deletions extension.meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@
</author>
</authors>
<releases>
<release version="1.0" date="2011-03-17" min="2.2" max="2.2.5" />
<release version="1.1" date="2012-05-08" min="2.3" />
<release version="1.3" date="2016-05-17" min="2.3" max="2.6.7">
Updated `...nce()->Author->isD...` to `...nce()->Author()->isD...` per [migration guide](https://github.com/symphonycms/symphony-2/wiki/Migration-Guide-to-2.5-for-Developers#properties).
Copy link

@nitriques nitriques May 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

max should be "2.x.x" as this is the best practice right now. The 2.x series will not break anything.

</release>
<release version="1.2" date="2012-10-04" min="2.3">
Added functionality to hide menu elements created by other extensions. __Important:__ Since extensions can
not (yet) influence the execution order of extensions in Symphony, you need to apply a tiny little 'hack'
to Symphony to make sure the 'Author Roles'-extension is executed as last, after all other extensions have
made their possible modifications to the navigation. Read the readme for more details.
</release>
<release version="1.1" date="2012-05-08" min="2.3" />
<release version="1.0" date="2011-03-17" min="2.2" max="2.2.5" />
</releases>
</extension>