Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ezsystems/ezpublish-legacy
base: master
...
head fork: xmak/ezpublish
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 5 files changed
  • 1 commit comment
  • 1 contributor
View
31 design/admin2/templates/class/view.tpl
@@ -23,6 +23,10 @@
</div>
{/if}
+<div class="button-right">
+{include uri="design:class/view_controls.tpl"}
+</div>
+
<div class="context-block">
{* DESIGN: Header START *}<div class="box-header">
<h1 class="context-title" title="{'Class name and number of objects'|i18n( 'design/admin/class/view' )}">{$class.identifier|class_icon( 'normal', $class.nameList[$language_code]|wash )}&nbsp;{$class.nameList[$language_code]|wash} [{$class.object_count} objects]</h1>
@@ -205,32 +209,7 @@
</div>
{* DESIGN: Content END *}</div>
-<div class="block">
-<div class="controlbar">
-{* DESIGN: Control bar START *}<div class="box-bc">
- <form action={concat( '/class/edit/', $class.id )|ezurl} method="post">
-
- {def $languages=$class.prioritized_languages
- $availableLanguages = fetch( 'content', 'prioritized_languages' )}
- {if and( eq( $availableLanguages|count, 1 ), eq( $languages|count, 1 ), is_set( $languages[$availableLanguages[0].locale] ) )}
- <input type="hidden" name="EditLanguage" value="{$availableLanguages[0].locale|wash()}" />
- {else}
- <select name="EditLanguage" title="{'Use this menu to select the language you want to use for editing then click the "Edit" button.'|i18n( 'design/admin/class/view' )|wash()}">
- {foreach $languages as $language}
- <option value="{$language.locale|wash()}">{$language.name|wash()}</option>
- {/foreach}
- {if gt( $class.can_create_languages|count, 0 )}
- <option value="">{'Another language'|i18n( 'design/admin/class/view')}</option>
- {/if}
- </select>
- {/if}
- {undef $languages $availableLanguages}
- <input class="button" type="submit" name="_DefaultButton" value="{'Edit'|i18n( 'design/admin/class/view' )}" title="{'Edit this class.'|i18n( 'design/admin/class/view' )}" />
- {* <input class="button" type="submit" name="_DefaultButton" value="{'Remove'|i18n( 'design/admin/class/view' )}" /> *}
- </form>
-{* DESIGN: Control bar END *}</div>
-</div>
-</div>
+{include uri="design:class/view_controls.tpl"}
{include uri="design:class/windows.tpl"}
</div>
View
26 design/admin2/templates/class/view_controls.tpl
@@ -0,0 +1,26 @@
+<div class="block">
+<div class="controlbar">
+{* DESIGN: Control bar START *}<div class="box-bc">
+ <form action={concat( '/class/edit/', $class.id )|ezurl} method="post">
+
+ {def $languages=$class.prioritized_languages
+ $availableLanguages = fetch( 'content', 'prioritized_languages' )}
+ {if and( eq( $availableLanguages|count, 1 ), eq( $languages|count, 1 ), is_set( $languages[$availableLanguages[0].locale] ) )}
+ <input type="hidden" name="EditLanguage" value="{$availableLanguages[0].locale|wash()}" />
+ {else}
+ <select name="EditLanguage" title="{'Use this menu to select the language you want to use for editing then click the "Edit" button.'|i18n( 'design/admin/class/view' )|wash()}">
+ {foreach $languages as $language}
+ <option value="{$language.locale|wash()}">{$language.name|wash()}</option>
+ {/foreach}
+ {if gt( $class.can_create_languages|count, 0 )}
+ <option value="">{'Another language'|i18n( 'design/admin/class/view')}</option>
+ {/if}
+ </select>
+ {/if}
+ {undef $languages $availableLanguages}
+ <input class="button" type="submit" name="_DefaultButton" value="{'Edit'|i18n( 'design/admin/class/view' )}" title="{'Edit this class.'|i18n( 'design/admin/class/view' )}" />
+ {* <input class="button" type="submit" name="_DefaultButton" value="{'Remove'|i18n( 'design/admin/class/view' )}" /> *}
+ </form>
+{* DESIGN: Control bar END *}</div>
+</div>
+</div>
View
6 design/standard/templates/user/registrationfeedback.tpl
@@ -7,4 +7,8 @@
{'Email'|i18n('design/standard/user/register')}: {$user.email}
{'Link to user information'|i18n('design/standard/user/register')}:
-http://{$hostname}{concat('content/view/full/',$object.main_node_id)|ezurl(no)}
+{if ezini( 'UserSettings', 'VerifyUserType' )|compare( '' )}
+ http://{$hostname}{concat('content/view/full/',$object.main_node_id)|ezurl(no)}
+{else}
+ http://{$hostname}{concat( 'content/versionview/', $object.id, '/', $object.current.version )|ezurl( no )}
+{/if}
View
5 design/standard/templates/user/registrationinfo.tpl
@@ -20,7 +20,10 @@ http://{$hostname}{concat( 'user/activate/', $hash, '/', $object.main_node_id )|
{/if}
+
+{if ezini( 'UserSettings', 'VerifyUserType' )|compare( '' )}
{'Link to user information'|i18n('design/standard/user/register')}:
-http://{$hostname}{concat('content/view/full/',$object.main_node_id)|ezurl(no)}
+ http://{$hostname}{concat('content/view/full/',$object.main_node_id)|ezurl(no)}
+{/if}
{/let}
View
3  kernel/content/attribute_edit.php
@@ -449,7 +449,8 @@
{
$sectionID = $object->attribute( 'section_id' );
$section = eZSection::fetch( $sectionID );
- $res->setKeys( array( array( 'section', $object->attribute( 'section_id' ) ),
+ if ( $section )
+ $res->setKeys( array( array( 'section', $object->attribute( 'section_id' ) ),
array( 'section_identifier', $section->attribute( 'identifier' ) ) ) );
}

Showing you all comments on commits in this comparison.

@lolautruche
Collaborator

Complete fix for this issue : ezsystems@91816d0

Something went wrong with that request. Please try again.