discards b98a258f545eea7976d80c2bb6450a73caa9dd3c (commit)
discards 55ef55a5a9e951b26c52b3d2f0e5f902e568f1f9 (commit)
discards ca8489d71e127d5ff7beafbd91bcf5f9c683dd8d (commit)
discards 0cb41713987185aec7f42c9cff174b6d2757e460 (commit)
discards c2e63f1d8fc269cf17bd85d534c9099af8a454b6 (commit)
discards ee436d35144c7d85629d2c7356db64d5f392d1ff (commit)
via: 32250fa69ff8b942ca99c4eaabafde285cc27c9a (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (b98a258f545eea7976d80c2bb6450a73caa9dd3c)
\
N -- N -- N (32250fa69ff8b942ca99c4eaabafde285cc27c9a)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
= COMMIT LOG ===========================================================
committer: Mitch Capper
comments:
Added option to delete contacts
diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs
index 3c1b33b..66c3918 100644
--- a/mitchcapper/FSClient/SimpleContactPluginBase.cs
+++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs
@@ -23,6 +23,12 @@ namespace FSClient
{
return number;
}
+ protected virtual void DeleteNumber(string number){
+ number_to_alias.Remove(number);
+ }
+ protected virtual bool CanDeleteContact(){
+ return true;
+ }
protected virtual string IsValidAlias(String str)//return null to abort updating, otherwire return string
{
return str;
@@ -49,14 +55,34 @@ namespace FSClient
MenuItem item = new MenuItem();
item.Click += item_Click;
item.Header = "Edit Contact";
- items.Add(item);
+ items.Add(item);
+ if (CanDeleteContact()){
+ item = new MenuItem();
+ item.Click += delete_item_click;
+ item.Header = "Delete Contact";
+ items.Add(item);
+ }
item = new MenuItem();
item.Click +=contact_call_click;
item.Header = "Call";
items.Add(item);
return items;
- }
-
+ }
+
+ private void delete_item_click(object sender, RoutedEventArgs e){
+ MenuItem item = sender as MenuItem;
+ if (item == null)
+ return;
+
+ SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry;
+ if (entry == null)
+ return;
+ String number = entry.number;
+ number = NormalizeNumber(number);
+ DeleteNumber(number);
+ refresh_search_box();
+ }
+
private void contact_call_click(object sender, RoutedEventArgs e){
MenuItem item = sender as MenuItem;
if (item == null)
diff --git a/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs b/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs
index 55da854..3077954 100644
--- a/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs
+++ b/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs
@@ -88,6 +88,10 @@ namespace SimpleXmlContactPlugin {
protected override void UpdateDatabase(string number, string alias){
SaveDatabase();
+ }
+ protected override void DeleteNumber(string number) {
+ base.DeleteNumber(number);
+ SaveDatabase();
}
}
Summary of changes: mitchcapper/FSClient/SimpleContactPluginBase.cs | 32 +++++++++- .../SimpleXmlContactPlugin.cs | 4 + sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php | 2 +- sathieu/cisco-xml/lib/MediaBrotha/Backend.php | 10 --- sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php | 66 +++++--------------- sathieu/cisco-xml/lib/MediaBrotha/Core.php | 11 +--- sathieu/cisco-xml/lib/MediaBrotha/Form.php | 1 - .../lib/MediaBrotha/Frontend/CiscoXML.php | 31 +-------- .../cisco-xml/lib/MediaBrotha/Frontend/HTML.php | 41 +++++-------- 9 files changed, 72 insertions(+), 126 deletions(-)
this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email
For more info, see http://blog.chomperstomp.com/?p=630
--
FreeSWITCH user-contributed scripts, etc