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

fix channel creation and management after last changes

Browse Source
This commit is contained in:
friendica 2012-10-30 16:21:24 -07:00
parent dca20f4227
commit ffadf260c0
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/manage.php
View File

@ -22,8 +22,7 @@ function manage_content(&$a) {
$channels = null; $channels = null;
if(local_user()) { if(local_user()) {
$r = q("select channel.*, contact.* from channel left join contact on channel.channel_id = contact.uid $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d ",
where channel.channel_account_id = %d and contact.self = 1",
intval(get_account_id()) intval(get_account_id())
); );

2
version.inc
View File

@ -1 +1 @@
2012-10-29.122 2012-10-30.123

4
view/js/mod_new_channel.js
View File

@ -1,14 +1,14 @@
$(document).ready(function() { $(document).ready(function() {
$("#newchannel-name").blur(function() { $("#newchannel-name").blur(function() {
var zreg_name = $("#newchannel-name").val(); var zreg_name = $("#newchannel-name").val();
$.get("newchannel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
$("#newchannel-nickname").val(data); $("#newchannel-nickname").val(data);
zFormError("#newchannel-name-feedback",data.error); zFormError("#newchannel-name-feedback",data.error);
}); });
}); });
$("#newchannel-nickname").blur(function() { $("#newchannel-nickname").blur(function() {
var zreg_nick = $("#newchannel-nickname").val(); var zreg_nick = $("#newchannel-nickname").val();
$.get("newchannel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
$("#newchannel-nickname").val(data); $("#newchannel-nickname").val(data);
zFormError("#newchannel-nickname-feedback",data.error); zFormError("#newchannel-nickname-feedback",data.error);
}); });

2
view/tpl/channel.tpl
View File

@ -1,5 +1,5 @@
<div class="channel-selection"> <div class="channel-selection">
<a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.thumb" alt="$channel.channel_name" /></a> <a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.xchan_photo_m" alt="$channel.channel_name" /></a>
<a href="$channel.link" class="channel-selection-name-link" title="$channel.channel_name"><div class="channel-name">$channel.channel_name</div></a> <a href="$channel.link" class="channel-selection-name-link" title="$channel.channel_name"><div class="channel-name">$channel.channel_name</div></a>
</div> </div>
<div class="channel-selection-end"></div> <div class="channel-selection-end"></div>

2
view/tpl/new_channel.tpl
View File

@ -1,6 +1,6 @@
<h2>$title</h2> <h2>$title</h2>
<form action="newchannel" method="post" id="newchannel-form"> <form action="new_channel" method="post" id="newchannel-form">
<div id="newchannel-desc" class="descriptive-paragraph">$desc</div> <div id="newchannel-desc" class="descriptive-paragraph">$desc</div>