Skip to content

I
intranet-core
Commit 41bb6bfd authored by Project Open's avatar Project Open
Browse files
Options

- Fixed portlet behavior

parent e0fce1da
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 22 deletions
www/companies/view.adp
View file @ 41bb6bfd
<master src="../master"> <master>
<property name="doc(title)">@company_name;literal@</property> <property name="doc(title)">@company_name;literal@</property>
<property name="main_navbar_label">companies</property> <property name="main_navbar_label">companies</property>
<property name="left_navbar">@left_navbar_html;literal@</property> <property name="left_navbar">@left_navbar_html;literal@</property>
<property name="sub_navbar">@sub_navbar;literal@</property> <property name="sub_navbar">@sub_navbar;literal@</property>
<!-- left - right - bottom design --> <% if {"" eq $view_name || "standard" eq $view_name} { %>
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr> <tr><td>
<td valign="top" width="50%"> <%= [im_component_bay top] %>
<%= [im_component_bay left] %> </td></tr>
</td> </table>
<td width="2">&nbsp;</td>
<td valign="top"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<!-- Component Bay Right --> <tr>
<%= [im_component_bay right] %> <td valign="top" width="50%">
<!-- End Component Bay Right --> <%= [im_component_bay left] %>
</td> </td>
</tr> <td width="2">&nbsp;</td>
</table> <td valign="top">
<%= [im_component_bay right] %>
<table cellpadding="0" cellspacing="0" border="0" width="100%"> </td>
<tr><td> </tr>
<%= [im_component_bay bottom] %> </table>
</td></tr>
</table> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr><td>
<%= [im_component_bay bottom] %>
</td></tr>
</table>
<% } elseif {"files" eq $view_name} { %>
<div id="position_filestorage_view_files">
<%= [im_component_insert "Companies Filestorage Component"] %>
</div>
<% } else { %>
<%= [im_component_page -plugin_id $plugin_id -return_url "/intranet/companies/view?company_id=$company_id"] %>
<% } %>
www/companies/view.tcl
View file @ 41bb6bfd
...@@ -27,6 +27,7 @@ ad_page_contract { ...@@ -27,6 +27,7 @@ ad_page_contract {
{ forum_order_by "" } { forum_order_by "" }
show_all_correspondance_comments:integer,optional show_all_correspondance_comments:integer,optional
{ plugin_id "" } { plugin_id "" }
{ view_name "" }
} }
# ----------------------------------------------------------- # -----------------------------------------------------------
...@@ -48,6 +49,14 @@ if {0 == $company_id} { ...@@ -48,6 +49,14 @@ if {0 == $company_id} {
return return
} }
if {"" eq $view_name} {
if {"" eq $plugin_id} {
set view_name "standard"
} else {
set view_name "component"
}
}
# Check permissions. "See details" is an additional check for # Check permissions. "See details" is an additional check for
# critical information # critical information
im_company_permissions $user_id $company_id view read write admin im_company_permissions $user_id $company_id view read write admin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment