make content permissions sortable

3 files changed, 13 insertions, 7 deletions

diff --git a/LibertyContent.php b/LibertyContent.php
index b2fd76c..923b190 100644
--- a/LibertyContent.php
+++ b/LibertyContent.php
@@ -3,7 +3,7 @@
 * Management of Liberty content
 *
 * @package  liberty
-* @version  $Header: /cvsroot/bitweaver/_bit_liberty/LibertyContent.php,v 1.167 2007/01/06 09:46:18 squareing Exp $
+* @version  $Header: /cvsroot/bitweaver/_bit_liberty/LibertyContent.php,v 1.168 2007/01/07 12:01:09 squareing Exp $
 * @author   spider <spider@steelsun.com>
 */
 
@@ -727,9 +727,14 @@ vd( $this->mErrors );
 	 * 
 	 * @access public
 	 */
-	function loadAllObjectPermissions() {
+	function loadAllObjectPermissions( $pParamHash = NULL ) {
 		global $gBitUser;
 		$ret = FALSE;
+		if( empty( $pParamHash['sort_mode'] )) {
+			$pParamHash['sort_mode'] = 'group_name_asc';
+		}
+
+		LibertyContent::prepGetList( $pParamHash );
 		if( $this->isValid() && empty( $this->mPerms ) && $this->mContentTypeGuid ) {
 			$query = "
 				SELECT uop.`perm_name`, ug.`group_id`, ug.`group_name`, up.`perm_desc`
@@ -737,7 +742,8 @@ vd( $this->mErrors );
 					INNER JOIN `".BIT_DB_PREFIX."users_groups` ug ON( uop.`group_id`=ug.`group_id` )
 					LEFT OUTER JOIN `".BIT_DB_PREFIX."users_permissions` up ON( up.`perm_name`=uop.`perm_name` )
 				WHERE uop.`object_id` = ?
-					AND uop.`object_type` = ?";
+					AND uop.`object_type` = ?
+				ORDER BY ".$this->mDb->convertSortmode( $pParamHash['sort_mode'] );
 			$bindVars = array( $this->mContentId, $this->mContentTypeGuid );
 			$ret = $this->mDb->getAll( $query, $bindVars );
 		}
diff --git a/content_permissions_inc.php b/content_permissions_inc.php
index 90129cf..b22d2ee 100644
--- a/content_permissions_inc.php
+++ b/content_permissions_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.3 $
+ * @version  $Revision: 1.4 $
  * @package  liberty
  * @subpackage functions
  */
@@ -45,7 +45,7 @@ if( !empty( $_REQUEST["group_id"] ) && !empty( $gContent->mContentId ) && !empty
 }
 
 // Now we have to get the individual object permissions if any
-$assignedPerms = $gContent->loadAllObjectPermissions();
+$assignedPerms = $gContent->loadAllObjectPermissions( $_REQUEST );
 $gBitSmarty->assign( 'assignedPerms', $assignedPerms );
 
 // Get a list of groups
diff --git a/templates/content_permissions_inc.tpl b/templates/content_permissions_inc.tpl
index 5d1288a..b185ec2 100644
--- a/templates/content_permissions_inc.tpl
+++ b/templates/content_permissions_inc.tpl
@@ -38,8 +38,8 @@
 <table class="data">
 	<caption>{tr}Permissions assigned to this content{/tr}</caption>
 	<tr>
-		<th>{tr}Group{/tr}</th>
-		<th>{tr}Permission{/tr}</th>
+		<th>{smartlink content_id=$gContent->mContentId ititle=Group isort=group_name idefault=1}</th>
+		<th>{smartlink content_id=$gContent->mContentId ititle=Permission isort=perm_name}</th>
 		<th>{tr}Action{/tr}</th>
 	</tr>
 	{foreach from=$assignedPerms item=perm}