diff options
| -rw-r--r-- | edit_xref.php | 7 | ||||
| -rw-r--r-- | templates/list_xref_generic.tpl | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/edit_xref.php b/edit_xref.php index 2815875..a752439 100644 --- a/edit_xref.php +++ b/edit_xref.php @@ -19,6 +19,9 @@ $gBitSystem->verifyPackage( 'contact' ); $gBitSystem->verifyPermission( 'p_contact_update' ); include_once( CONTACT_PKG_PATH.'lookup_contact_inc.php' ); +if( empty( $gContent ) || !is_object( $gContent ) ) { + $gContent = new Contact(); +} if( !empty( $_REQUEST['xref_id'] ) ) { $gContent->loadXref( $_REQUEST['xref_id'] ); @@ -41,10 +44,10 @@ if (isset($_REQUEST["fCancel"])) { } } else if(isset( $_REQUEST["expunge"] ) ) { if( $gContent->stepXref( $_REQUEST ) ) { - if ( $_REQUEST['expunge'] > 2) { +// if ( $_REQUEST['expunge'] > 2) { header("Location: ".$gContent->getDisplayUrl() ); die; - } +// } } } diff --git a/templates/list_xref_generic.tpl b/templates/list_xref_generic.tpl index d7124b4..6fff932 100644 --- a/templates/list_xref_generic.tpl +++ b/templates/list_xref_generic.tpl @@ -57,20 +57,20 @@ <td> <span class="actionicon"> {if $gBitUser->hasPermission( 'p_contact_view_detail' )} - {smartlink ititle="View" ifile="view_xref.php" ibiticon="icons/view-fullscreen" xref_id=$pageInfo.$source[xref].xref_id} + {smartlink ititle="View" ifile="view_xref.php" ibiticon="icons/view-fullscreen" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id} {/if} {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } {if $pageInfo.$source[xref].source eq 'KEY_B' } - {smartlink ititle="Seal" ifile="edit_xref.php" ibiticon="icons/edit-redo" xref_id=$pageInfo.$source[xref].xref_id expunge=2} + {smartlink ititle="Seal" ifile="edit_xref.php" ibiticon="icons/edit-redo" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id expunge=2} {else} - {smartlink ititle="Edit" ifile="edit_xref.php" ibiticon="icons/accessories-text-editor" xref_id=$pageInfo.$source[xref].xref_id} + {smartlink ititle="Edit" ifile="edit_xref.php" ibiticon="icons/accessories-text-editor" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id} {/if} {/if} {if $gBitUser->hasPermission( 'p_contact_expunge' ) and $pageInfo.$source[xref].source ne 'KEY_B' } {if $source eq 'history' } - {smartlink ititle="Restore" ifile="edit_xref.php" ibiticon="icons/edit-undo" xref_id=$pageInfo.$source[xref].xref_id expunge=-1} + {smartlink ititle="Restore" ifile="edit_xref.php" ibiticon="icons/edit-undo" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id expunge=-1} {else} - {smartlink ititle="Delete" ifile="edit_xref.php" ibiticon="icons/edit-delete" xref_id=$pageInfo.$source[xref].xref_id expunge=1} + {smartlink ititle="Delete" ifile="edit_xref.php" ibiticon="icons/edit-delete" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id expunge=1} {/if} {/if} </span> |