harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

if deleting a photo go away to album

Browse Source
This commit is contained in:
marijus 2014-11-03 10:46:57 +01:00
parent 0e4f318b71
commit 2f85d12a6c
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/photos.php
View File

@ -196,7 +196,7 @@ function photos_post(&$a) {
} }
} }
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); goaway($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
} }
if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) { if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
@ -918,6 +918,8 @@ function photos_content(&$a) {
$aclselect_e = populate_acl($ph[0]); $aclselect_e = populate_acl($ph[0]);
$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer'])); $albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
$_SESSION['album_return'] = bin2hex($ph[0]['album']);
$edit = array( $edit = array(
'edit' => t('Edit photo'), 'edit' => t('Edit photo'),
'id' => $link_item['id'], 'id' => $link_item['id'],

14
view/tpl/photos_upload.tpl
View File

@ -31,20 +31,20 @@
<div id="photos-upload-new-end" class="clear"></div> <div id="photos-upload-new-end" class="clear"></div>
<div class="checkbox"> <div class="checkbox pull-left">
<label class="checkbox-inline" for="photos-upload-noshare" > <label class="checkbox-inline" for="photos-upload-noshare" >
<input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}} <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}}
</label> </label>
</div> </div>
{{if $uploader}} {{if $uploader}}
<div id="photos-upload-noshare-end"></div> <div id="photos-upload-perms" class="pull-right">
<div id="photos-upload-perms" class="photos-upload-perms" > <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span> <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> </button>
<div class="pull-right">
{{$uploader}}
</div> </div>
<div id="photos-upload-perms-end" class="clear"></div>
{{$uploader}}
{{/if}} {{/if}}
</form> </form>
</div> </div>